diff --git a/client.cpp b/client.cpp
index 97cff2250d..fc02bf45b6 100644
--- a/client.cpp
+++ b/client.cpp
@@ -77,9 +77,10 @@ public:
 		m_client->maximize( Client::MaximizeRestore );
 	}
 	
-	if ( ( mask & NET::StaysOnTop) != 0 && (state & NET::StaysOnTop) != 0  ) {
-	    m_client->setStaysOnTop( state & NET::StaysOnTop  );
-	    m_client->workspace()->raiseClient( m_client );
+	if ( mask & NET::StaysOnTop) {
+	    m_client->setStaysOnTop( (state & NET::StaysOnTop) != 0 );
+	    if ( m_client->staysOnTop() )
+		m_client->workspace()->raiseClient( m_client );
 	}
     }
 private: