diff --git a/main/gui/source/window/window.cpp b/main/gui/source/window/window.cpp
index ca48295e6..408589e90 100644
--- a/main/gui/source/window/window.cpp
+++ b/main/gui/source/window/window.cpp
@@ -790,8 +790,10 @@ namespace hex {
                         view->setFocused(focused);
 
                         // Dock the window if it's not already docked
-                        if (view->didWindowJustOpen() && !ImGui::IsWindowDocked()) {
-                            ImGui::DockBuilderDockWindow(windowName.c_str(), ImHexApi::System::getMainDockSpaceId());
+                        if (view->didWindowJustOpen()) {
+                            if (!ImGui::IsWindowDocked())
+                                ImGui::DockBuilderDockWindow(windowName.c_str(), ImHexApi::System::getMainDockSpaceId());
+
                             EventViewOpened::post(view.get());
                         }