diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index abab8710..447869aa 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -44,11 +44,11 @@ void moveresize_startup(gboolean reconfig)
 
 void moveresize_shutdown(gboolean reconfig)
 {
-    if (moveresize_in_progress)
-        moveresize_end(FALSE);
-
-    if (!reconfig)
+    if (!reconfig) {
+        if (moveresize_in_progress)
+            moveresize_end(FALSE);
         client_remove_destructor(client_dest);
+    }
 
     popup_free(popup);
     popup = NULL;