diff --git a/apps/openmw/mwgui/keyboardnavigation.cpp b/apps/openmw/mwgui/keyboardnavigation.cpp
index 840a12f1e0..ba09ce3699 100644
--- a/apps/openmw/mwgui/keyboardnavigation.cpp
+++ b/apps/openmw/mwgui/keyboardnavigation.cpp
@@ -82,6 +82,9 @@ bool KeyboardNavigation::switchFocus(int direction, bool wrap)
     if (!isButtonFocus() && direction != D_Prev && direction != D_Next)
         return false;
 
+    if ((direction == D_Prev || direction == D_Next) && focus->getUserString("AcceptTab") == "true")
+        return false;
+
     MyGUI::Widget* window = MyGUI::InputManager::getInstance().getKeyFocusWidget();
     while (window->getParent())
         window = window->getParent();
diff --git a/files/mygui/openmw_console.layout b/files/mygui/openmw_console.layout
index 854568f9bd..103cdcf14d 100644
--- a/files/mygui/openmw_console.layout
+++ b/files/mygui/openmw_console.layout
@@ -18,6 +18,7 @@
     <!-- Command line -->
     <Widget type="EditBox" skin="MW_ConsoleCommand" position="0 338 384 28" align="HStretch Bottom" name="edit_Command">
         <Property key="InvertSelected" value="false"/>
+        <UserString key="AcceptTab" value="true"/>
     </Widget>
 
   </Widget>