diff --git a/imgui.cpp b/imgui.cpp
index ab6e0a0b..8ecd695e 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -3005,7 +3005,7 @@ static bool IsPopupOpen(ImGuiID id)
 void ImGui::OpenPopup(const char* str_id)
 {
     ImGuiState& g = *GImGui;
-    ImGuiWindow* window = GetCurrentWindow();
+    ImGuiWindow* window = g.CurrentWindow;
     ImGuiID id = window->GetID(str_id);
     int current_stack_size = g.CurrentPopupStack.Size;
     ImGuiPopupRef popup_ref = ImGuiPopupRef(id, window, window->GetID("##menus"), g.IO.MousePos); // Tagged as new ref because constructor sets Window to NULL (we are passing the ParentWindow info here)