diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 258428c23..f5d42f2c0 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -508,9 +508,11 @@ class TabbedBrowser(tabwidget.TabWidget):
     @pyqtSlot(usertypes.KeyMode)
     def on_mode_left(self, mode):
         """Give focus to current tab if command mode was left."""
-        if mode == usertypes.KeyMode.command:
+        if mode in (usertypes.KeyMode.command, usertypes.KeyMode.prompt,
+                    usertypes.KeyMode.yesno):
             widget = self.currentWidget()
-            log.modes.debug("Left command mode, focusing {!r}".format(widget))
+            log.modes.debug("Left status-input mode, focusing {!r}".format(
+                widget))
             if widget is None:
                 return
             widget.setFocus()