diff --git a/app/playlists.py b/app/playlists.py
index 7295959..8c0c5bc 100644
--- a/app/playlists.py
+++ b/app/playlists.py
@@ -360,7 +360,6 @@ class PlaylistTab(QTableWidget):
                     self._set_row_start_time(row, start_time)
                 else:
                     self._set_row_start_time(row, None)
-
             else:
                 track = None
                 if track_id:
@@ -376,8 +375,6 @@ class PlaylistTab(QTableWidget):
                         # which currently it isn't).
                         self.musicmuster.update_headers()
 
-        self.edit_cell_type = None
-
     def closeEditor(self,
                     editor: QWidget,
                     hint: QAbstractItemDelegate.EndEditHint) -> None:
@@ -391,6 +388,7 @@ class PlaylistTab(QTableWidget):
         with Session() as session:
             self.update_display(session)
 
+        self.edit_cell_type = None
         self.musicmuster.enable_play_next_controls()
 
         super(PlaylistTab, self).closeEditor(editor, hint)
@@ -402,9 +400,8 @@ class PlaylistTab(QTableWidget):
         Override QAbstractItemView.edit to catch when editing starts
         """
 
-        self.edit_cell_type = None
         result = super(PlaylistTab, self).edit(index, trigger, event)
-        if result:
+        if result:      # will only be true on double-clicke
             row = index.row()
             column = index.column()
 
@@ -436,9 +433,6 @@ class PlaylistTab(QTableWidget):
                 note_column = 1
                 self.edit_cell_type = "row_notes"
 
-            # Connect signal so we know when cell has changed.
-            self.cellChanged.connect(self._cell_changed)
-
             # Disable play controls so that keyboard input doesn't
             # disturb playing
             self.musicmuster.disable_play_next_controls()
@@ -454,6 +448,9 @@ class PlaylistTab(QTableWidget):
                     item = self.item(row, note_column)
                     item.setText(plr_item.note)
 
+            # Connect signal so we know when cell has changed.
+            self.cellChanged.connect(self._cell_changed)
+
         return result
 
 #     # ########## Externally called functions ##########