diff --git a/app/playlists.py b/app/playlists.py
index e48c0db..b973348 100644
--- a/app/playlists.py
+++ b/app/playlists.py
@@ -383,6 +383,13 @@ class PlaylistTab(QTableWidget):
         play controls and update display.
         """
 
+        # If edit was cancelled (eg, by pressing ESC), the signal will
+        # still be connected
+        try:
+            self.cellChanged.disconnect(self._cell_changed)
+        except TypeError:
+            pass
+
         self.edit_cell_type = None
         self.musicmuster.enable_play_next_controls()
         self.musicmuster.actionSetNext.setEnabled(True)