diff --git a/app/playlists.py b/app/playlists.py
index 3119c0c..feff9f0 100644
--- a/app/playlists.py
+++ b/app/playlists.py
@@ -877,20 +877,20 @@ class PlaylistTab(QTableWidget):
             track = self.musicmuster.get_one_track(session)
             if not track:
                 return
-
             plr.track_id = track.id
-            session.flush()
 
             # Reset row span
-            self.setSpan(row, HEADER_NOTES_COLUMN, 1, 1)
+            self.setSpan(row_number, HEADER_NOTES_COLUMN, 1, 1)
 
             # Update attributes of row
-            self._set_row_bold(row)
-            self._set_row_colour_default(plr.row_number)
-            self._set_row_header_text(session, row, plr.note)
-            self._update_row_track_info(session, row, track)
-            self._update_start_end_times()
+            self._update_row_track_info(session, row_number, track)
+            self._set_row_bold(row_number)
+            self._set_row_colour_default(row_number)
+            self._set_row_note_text(session, row_number, plr.note)
             self.clear_selection()
+            self.save_playlist(session)
+            # Update times once display updated
+            QTimer.singleShot(0, self._update_start_end_times)
 
     def _build_context_menu(self, item: QTableWidgetItem) -> None:
         """Used to process context (right-click) menu, which is defined here"""
@@ -1501,6 +1501,8 @@ class PlaylistTab(QTableWidget):
                 _ = self._set_item_text(row, i, "")
             # Remove row duration
             self._set_row_duration(row, 0)
+            # Remove row start gap
+            self._set_row_start_gap(row, None)
             # Remote track_id from row
             _ = self._set_row_userdata(row, self.ROW_TRACK_ID, 0)
             # Span the rows