diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 1a9aea3442..f23c1afffc 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -1655,8 +1655,10 @@ class BooksView(QTableView):  # {{{
             index = self.moveCursor(move_by, Qt.KeyboardModifier.NoModifier)
             if index.isValid():
                 def edit():
-                    self.setCurrentIndex(index)
-                    self.edit(index)
+                    if index.isValid():
+                        self.setCurrentIndex(index)
+                        self.edit(index)
+                        self._model.current_changed(index, None)
                 QTimer.singleShot(0, edit)
         return ans