diff --git a/Dalamud/Game/Gui/Internal/DalamudIME.cs b/Dalamud/Game/Gui/Internal/DalamudIME.cs
index e955997fd..419b01de9 100644
--- a/Dalamud/Game/Gui/Internal/DalamudIME.cs
+++ b/Dalamud/Game/Gui/Internal/DalamudIME.cs
@@ -128,9 +128,9 @@ namespace Dalamud.Game.Gui.Internal
         private void ToggleWindow(bool visible)
         {
             if (visible)
-                Service<DalamudInterface>.Get().OpenIMEWindow();
+                Service<DalamudInterface>.Get().OpenImeWindow();
             else
-                Service<DalamudInterface>.Get().CloseIMEWindow();
+                Service<DalamudInterface>.Get().CloseImeWindow();
         }
 
         private long WndProcDetour(IntPtr hWnd, uint msg, ulong wParam, long lParam)
diff --git a/Dalamud/Interface/Internal/DalamudCommands.cs b/Dalamud/Interface/Internal/DalamudCommands.cs
index 56ec778d8..e81d9f5a4 100644
--- a/Dalamud/Interface/Internal/DalamudCommands.cs
+++ b/Dalamud/Interface/Internal/DalamudCommands.cs
@@ -289,7 +289,7 @@ namespace Dalamud.Interface.Internal
 
         private void OnDebugDrawIMEPanel(string command, string arguments)
         {
-            Service<DalamudInterface>.Get().OpenIMEWindow();
+            Service<DalamudInterface>.Get().OpenImeWindow();
         }
 
         private void OnOpenLog(string command, string arguments)
diff --git a/Dalamud/Interface/Internal/DalamudInterface.cs b/Dalamud/Interface/Internal/DalamudInterface.cs
index a25279e26..cd314a756 100644
--- a/Dalamud/Interface/Internal/DalamudInterface.cs
+++ b/Dalamud/Interface/Internal/DalamudInterface.cs
@@ -232,7 +232,7 @@ namespace Dalamud.Interface.Internal
         /// <summary>
         /// Opens the <see cref="IMEWindow"/>.
         /// </summary>
-        public void OpenIMEWindow() => this.imeWindow.IsOpen = true;
+        public void OpenImeWindow() => this.imeWindow.IsOpen = true;
 
         /// <summary>
         /// Opens the <see cref="ConsoleWindow"/>.
@@ -263,7 +263,7 @@ namespace Dalamud.Interface.Internal
         /// Opens the <see cref="StyleEditorWindow"/>.
         /// </summary>
         public void OpenStyleEditor() => this.styleEditorWindow.IsOpen = true;
-        
+
         /// <summary>
         /// Opens the <see cref="ProfilerWindow"/>.
         /// </summary>
@@ -276,7 +276,12 @@ namespace Dalamud.Interface.Internal
         /// <summary>
         /// Closes the <see cref="IMEWindow"/>.
         /// </summary>
-        public void CloseIMEWindow() => this.imeWindow.IsOpen = false;
+        public void CloseImeWindow() => this.imeWindow.IsOpen = false;
+
+        /// <summary>
+        /// Closes the <see cref="GamepadModeNotifierWindow"/>.
+        /// </summary>
+        public void CloseGamepadModeNotifierWindow() => this.gamepadModeNotifierWindow.IsOpen = false;
 
         #endregion
 
diff --git a/Dalamud/Interface/Internal/Windows/IMEWindow.cs b/Dalamud/Interface/Internal/Windows/IMEWindow.cs
index f07c56202..328f09c45 100644
--- a/Dalamud/Interface/Internal/Windows/IMEWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/IMEWindow.cs
@@ -29,7 +29,7 @@ namespace Dalamud.Interface.Internal.Windows
         /// <inheritdoc/>
         public override void Draw()
         {
-            if (this.IsOpen && Service<KeyState>.Get()[VirtualKey.SHIFT]) Service<DalamudInterface>.Get().CloseIMEWindow();
+            if (this.IsOpen && Service<KeyState>.Get()[VirtualKey.SHIFT]) Service<DalamudInterface>.Get().CloseImeWindow();
             var ime = Service<DalamudIME>.GetNullable();
 
             if (ime == null || !ime.IsEnabled)
@@ -42,7 +42,7 @@ namespace Dalamud.Interface.Internal.Windows
         /// <inheritdoc/>
         public override void PostDraw()
         {
-            if (this.IsOpen && Service<KeyState>.Get()[VirtualKey.SHIFT]) Service<DalamudInterface>.Get().CloseIMEWindow();
+            if (this.IsOpen && Service<KeyState>.Get()[VirtualKey.SHIFT]) Service<DalamudInterface>.Get().CloseImeWindow();
             var ime = Service<DalamudIME>.GetNullable();
 
             if (ime == null || !ime.IsEnabled)
diff --git a/Dalamud/Interface/Internal/Windows/SettingsWindow.cs b/Dalamud/Interface/Internal/Windows/SettingsWindow.cs
index 729390aa0..2dd5b2c57 100644
--- a/Dalamud/Interface/Internal/Windows/SettingsWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/SettingsWindow.cs
@@ -952,6 +952,9 @@ namespace Dalamud.Interface.Internal.Windows
             {
                 ImGui.GetIO().BackendFlags &= ~ImGuiBackendFlags.HasGamepad;
                 ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.NavEnableSetMousePos;
+
+                var di = Service<DalamudInterface>.Get();
+                di.CloseGamepadModeNotifierWindow();
             }
             else
             {