diff --git a/imgui.cpp b/imgui.cpp
index 875c8352..e3456a0a 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -3830,7 +3830,7 @@ void ImGui::EndFrame()
                 if (g.HoveredRootWindow != NULL)
                 {
                     StartMouseMovingWindow(g.HoveredWindow);
-                    if (g.IO.ConfigWindowsMoveFromTitleBarOnly && !(g.HoveredRootWindow->Flags & ImGuiWindowFlags_NoTitleBar))
+                    if (g.IO.ConfigWindowsMoveFromTitleBarOnly && (!(g.HoveredRootWindow->Flags & ImGuiWindowFlags_NoTitleBar) || g.HoveredWindow->RootWindowDockStop->DockIsActive))
                         if (!g.HoveredRootWindow->TitleBarRect().Contains(g.IO.MouseClickedPos[0]))
                             g.MovingWindow = NULL;
                 }