diff --git a/geometry.cpp b/geometry.cpp
index 989731b5af..6051dd724a 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -2739,7 +2739,8 @@ bool Client::startMoveResize()
         move_resize_grab_window = None;
         return false;
         }
-    if( maximizeMode() == MaximizeFull && options->electricBorderMaximize() )
+    if( maximizeMode() == MaximizeFull && options->electricBorderMaximize() &&
+        !options->moveResizeMaximizedWindows() )
         { // If we have quick maximization enabled then it's safe to automatically restore windows
           // when starting a move as the user can undo their action by moving the window back to
           // the top of the screen. When the setting is disabled then doing so is confusing.