diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 8df3a080..abab8710 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -44,6 +44,9 @@ void moveresize_startup(gboolean reconfig)
 
 void moveresize_shutdown(gboolean reconfig)
 {
+    if (moveresize_in_progress)
+        moveresize_end(FALSE);
+
     if (!reconfig)
         client_remove_destructor(client_dest);