diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index ac8c0475a0..6a4154e184 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1498,7 +1498,11 @@ namespace MWGui
         if (Settings::gui().mControllerMenus)
         {
             if (mGuiModes.empty())
+            {
                 setControllerTooltipVisible(false);
+                // When all windows are hidden, reset tooltip visibility to user's preference.
+                mControllerTooltipEnabled = Settings::gui().mControllerTooltips;
+            }
             else
                 reapplyActiveControllerWindow();
         }