diff --git a/geometry.cpp b/geometry.cpp
index 0e134e03e8..7f36586a89 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -2567,7 +2567,7 @@ bool Client::startMoveResize()
     // 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.
-    if (maximizeMode() != MaximizeRestore && options->moveResizeMaximizedWindows()) {
+    if (maximizeMode() != MaximizeRestore && (maximizeMode() != MaximizeFull || options->moveResizeMaximizedWindows())) {
         // allow moveResize, but unset maximization state in resize case
         if (mode != PositionCenter) { // means "isResize()" but moveResizeMode = true is set below
             geom_restore = geom_pretile = geometry(); // "restore" to current geometry