diff --git a/client.cpp b/client.cpp
index 025945809b..392f527af0 100644
--- a/client.cpp
+++ b/client.cpp
@@ -987,7 +987,7 @@ bool Client::configureRequest( XConfigureRequestEvent& e )
 	    && ( ns.width() < area.width() || ns.height() < area.height() ) ) {
 	  geom_restore.setSize( ns );
 	  maximize( Client::MaximizeRestore );
-	} else {
+	} else if ( !isMaximized() ) {
 	  if ( ns == size() )
 	    return TRUE; // broken xemacs stuff (ediff)
 	  resize( ns );