diff --git a/src/util/imgui_fullscreen.cpp b/src/util/imgui_fullscreen.cpp
index 452d08b92..223927895 100644
--- a/src/util/imgui_fullscreen.cpp
+++ b/src/util/imgui_fullscreen.cpp
@@ -833,6 +833,13 @@ void ImGuiFullscreen::QueueResetFocus(FocusResetType type)
   s_state.focus_reset_queued = type;
   s_state.close_button_state =
     (s_state.close_button_state != CloseButtonState::Cancelled) ? CloseButtonState::None : CloseButtonState::Cancelled;
+
+  GImGui->NavMoveSubmitted = false;
+  GImGui->NavMoveDir = ImGuiDir_None;
+  GImGui->NavMoveFlags = ImGuiNavMoveFlags_None;
+  GImGui->NavMoveScrollFlags = ImGuiScrollFlags_None;
+  GImGui->NavMoveClipDir = GImGui->NavMoveDir;
+  GImGui->NavScoringNoClipRect = ImRect(+FLT_MAX, +FLT_MAX, -FLT_MAX, -FLT_MAX);
 }
 
 bool ImGuiFullscreen::ResetFocusHere()