diff --git a/app/playlists.py b/app/playlists.py
index 0963914..4b25ab9 100644
--- a/app/playlists.py
+++ b/app/playlists.py
@@ -251,10 +251,17 @@ class PlaylistTab(QTableWidget):
                 rowMapping[row + len(rows)] = targetRow + idx
         colCount = self.columnCount()
         for srcRow, tgtRow in sorted(rowMapping.items()):
-            for col in range(0, colCount):
-                self.setItem(tgtRow, col, self.takeItem(srcRow, col))
+            if self._get_row_track_id(srcRow):
+                # This is a track row
+                for col in range(0, colCount):
+                    self.setItem(tgtRow, col, self.takeItem(srcRow, col))
+            else:
+                self.setItem(tgtRow, HEADER_NOTES_COLUMN,
+                             self.takeItem(srcRow, HEADER_NOTES_COLUMN))
+                self.setSpan(tgtRow, HEADER_NOTES_COLUMN, 1, len(columns) - 1)
         for row in reversed(sorted(rowMapping.keys())):
             self.removeRow(row)
+        self.resizeRowsToContents()
         event.accept()
 
         # Scroll to drop zone