diff --git a/app/playlists.py b/app/playlists.py
index b038769..74e50ea 100644
--- a/app/playlists.py
+++ b/app/playlists.py
@@ -567,7 +567,7 @@ class PlaylistTab(QTableWidget):
 
         if not track:
             log.debug(
-                f"insert_track({session=}, {note=}, {repaint=}"
+                f"insert_track(session={hex(id(Session))}, {note=}, {repaint=}"
                 " called with no track"
             )
             return
@@ -1080,6 +1080,10 @@ class PlaylistTab(QTableWidget):
             # Remove from display
             self.remove_rows(rows_to_delete)
 
+            # Need to save the playlist to ensure the PlaylistRows have
+            # the correct row_number
+            self.save_playlist(session)
+
             # Reset drag mode
             self.setDragEnabled(False)
 
@@ -1482,6 +1486,9 @@ class PlaylistTab(QTableWidget):
             self._set_row_header_text(session, row_number, plr.note)
             self.clear_selection()
 
+            # Save playlist to ensure correct detection of new header
+            # row
+            self.save_playlist(session)
             # Set track start/end times after track list is populated
             self._update_start_end_times(session)