diff --git a/client.cpp b/client.cpp
index 9658658915..6afd522146 100644
--- a/client.cpp
+++ b/client.cpp
@@ -1259,6 +1259,8 @@ void Client::mouseMoveEvent( QMouseEvent * e)
 		// in case we were maximized, reset state
 		max_mode = MaximizeRestore;
 		maximizeChange(FALSE );
+		Events::raise( Events::UnMaximize );
+		info->setState( 0, NET::Max );
 	    }
 	    workspace()->setFocusChangeEnabled(false);
 	    Events::raise( isResize() ? Events::ResizeStart : Events::MoveStart );
@@ -2171,6 +2173,8 @@ bool Client::performMouseCommand( Options::MouseCommand command, QPoint globalPo
 	    // in case we were maximized, reset state
 	    max_mode = MaximizeRestore;
 	    maximizeChange(FALSE );
+	    Events::raise( Events::UnMaximize );
+	    info->setState( 0, NET::Max );
 	}
 	workspace()->setFocusChangeEnabled(false);
 	buttonDown = TRUE;
@@ -2189,6 +2193,8 @@ bool Client::performMouseCommand( Options::MouseCommand command, QPoint globalPo
 	    // in case we were maximized, reset state
 	    max_mode = MaximizeRestore;
 	    maximizeChange(FALSE );
+	    Events::raise( Events::UnMaximize );
+	    info->setState( 0, NET::Max );
 	}
 	workspace()->setFocusChangeEnabled(false);
 	buttonDown = TRUE;
diff --git a/options.cpp b/options.cpp
index 6d202f3a07..a3e77776f4 100644
--- a/options.cpp
+++ b/options.cpp
@@ -143,7 +143,7 @@ void Options::reload()
     config->setGroup( "Windows" );
     moveMode = config->readEntry("MoveMode", "Opaque" ) == "Opaque"?Opaque:Transparent;
     resizeMode = config->readEntry("ResizeMode", "Opaque" ) == "Opaque"?Opaque:Transparent;
-    moveResizeMaximizedWindows = config->readBoolEntry("MoveResizeMaximizedWindows", FALSE );
+    moveResizeMaximizedWindows = config->readBoolEntry("MoveResizeMaximizedWindows", true );
 
 
     QString val;