diff --git a/app/playlistmodel.py b/app/playlistmodel.py
index cb556f6..7da15b1 100644
--- a/app/playlistmodel.py
+++ b/app/playlistmodel.py
@@ -790,12 +790,15 @@ class PlaylistModel(QAbstractTableModel):
             # Optimise: only add to map if there is a change
             if old_row != new_row:
                 row_map[old_row] = new_row
-                if self.is_header_row(old_row):
-                    # Reset column span
-                    self.signals.span_cells_signal.emit(
-                        old_row, HEADER_NOTES_COLUMN, 1, 1
-                    )
 
+        # Reset any header rows that we're moving
+        for moving_row in row_map:
+            if self.is_header_row(moving_row):
+                # Reset column span
+                print(f"Reset column span {moving_row=}")
+                self.signals.span_cells_signal.emit(
+                    moving_row, HEADER_NOTES_COLUMN, 1, 1
+                )
         # Check to see whether any rows in track_sequence have moved
         if track_sequence.previous.plr_rownum in row_map:
             track_sequence.previous.plr_rownum = row_map[