diff --git a/src/Window.cc b/src/Window.cc
index 3fc0f43d..7ce182dc 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1494,6 +1494,9 @@ void OpenboxWindow::close(void) {
 
 
 void OpenboxWindow::withdraw(void) {
+  if (flags.moving)
+    endMove();
+
   flags.visible = False;
   flags.iconic = False;