diff --git a/layers.cpp b/layers.cpp
index 1d7ea109f1..7a71086e46 100644
--- a/layers.cpp
+++ b/layers.cpp
@@ -97,9 +97,9 @@ void Workspace::updateClientLayer( Client* c )
 
 void Workspace::updateStackingOrder( bool propagate_new_clients )
     {
-    if( block_stacking_updates > 0 )
+    if( block_stacking_updates > 0 && propagate_new_clients )
         {
-        blocked_propagating_new_clients |= propagate_new_clients;
+        blocked_propagating_new_clients = true;
         return;
         }
     ClientList new_stacking_order = constrainedStackingOrder();
diff --git a/useractions.cpp b/useractions.cpp
index aaac2312b1..5ef2135181 100644
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -470,7 +470,7 @@ bool Client::performMouseCommand( Options::MouseCommand command, QPoint globalPo
             cancelShadeHover();
             break;
         case Options::MouseOperationsMenu:
-            if ( isActive() & options->clickRaise )
+            if ( isActive() && options->clickRaise )
                 autoRaise();
             workspace()->showWindowMenu( globalPos, this );
             break;