app/musicmuster.py

@@ -1222,6 +1222,12 @@ class Window(QMainWindow, Ui_MainWindow):
         self.txtSearch.setText("")
         self.txtSearch.setHidden(True)
 
+    def search_playlist_return(self) -> None:
+        """Initiate search when return pressed"""
+
+        self.active_tab().set_search(self.txtSearch.text())
+        self.enable_play_next_controls()
+
     def search_playlist_text_changed(self) -> None:
         """
         Incremental search of playlist

app/playlists.py

@@ -212,6 +212,8 @@ class PlaylistTab(QTableView):
         Override closeEditor to enable play controls and update display.
         """
 
+        self.musicmuster.enable_play_next_controls()
+        self.musicmuster.actionSetNext.setEnabled(True)
         self.musicmuster.action_Clear_selection.setEnabled(True)
 
         super(PlaylistTab, self).closeEditor(editor, hint)
@@ -253,6 +255,33 @@ class PlaylistTab(QTableView):
 
             event.accept()
 
+    @overload
+    def edit(self, index: QModelIndex) -> None:
+        ...
+
+    @overload
+    def edit(
+        self,
+        index: QModelIndex,
+        trigger: QAbstractItemView.EditTrigger,
+        event: Optional[QEvent]
+    ) -> bool:
+        ...
+
+    def edit(self, index, trigger, event):
+        """
+        Override QAbstractItemView.edit to catch when editing starts
+
+        Editing only ever starts with a double click on a cell
+        """
+
+        # 'result' will only be true on double-click
+        result = super().edit(index, trigger, event)
+        if result:
+            self.musicmuster.disable_play_next_controls()
+
+        return result
+
     def mouseReleaseEvent(self, event):
         """
         Enable dragging if rows are selected
@@ -431,11 +460,6 @@ class PlaylistTab(QTableView):
         """Unselect all tracks and reset drag mode"""
 
         self.clearSelection()
-        # We want to remove the focus from any widget otherwise keyboard
-        # activity may edit a cell.
-        fw = self.musicmuster.focusWidget()
-        if fw:
-            fw.clearFocus()
         self.setDragEnabled(False)
 
     def _column_resize(self, column_number: int, _old: int, _new: int) -> None: