Make sure global escape still works in Vim mode

Author: vkbo

novelwriter/gui/doceditor.py

@@ -581,6 +581,12 @@ def updateDocMargins(self) -> None:
         lM = max(self._vpMargin, fH)
         self.setViewportMargins(tM, uM, tM, lM)
 
+    def isVimEscapable(self) -> bool:
+        """Check if Escape keypress should be processed for Vim mode."""
+        if CONFIG.vimMode and self._vim.mode != nwVimMode.NORMAL:
+            return True
+        return False
+
     ##
     #  Getters
     ##

novelwriter/guimain.py

@@ -1274,12 +1274,10 @@ def _keyPressReturn(self) -> None:
     @pyqtSlot()
     def _keyPressEscape(self) -> None:
         """Process an escape keypress in the main window."""
-        if CONFIG.vimMode:
-            self.docEditor.setVimMode(nwVimMode.NORMAL)
-            return
-
         if self.docEditor.searchVisible():
             self.docEditor.closeSearch()
+        elif self.docEditor.isVimEscapable():
+            self.docEditor.setVimMode(nwVimMode.NORMAL)
         elif SHARED.focusMode:
             SHARED.setFocusMode(False)