diff --git a/client.cpp b/client.cpp
index acf77d6ff6..fe1eba12ac 100644
--- a/client.cpp
+++ b/client.cpp
@@ -266,13 +266,11 @@ static void ungrabButton( WId winId, int modifier )
 void WindowWrapper::setActive( bool active )
 {
     if ( active ) {
-// Don't release this grab because then we won't get the events
-// necessary for raising an active but not topmost windows
-//        if ( options->focusPolicy == Options::ClickToFocus ||  !options->clickRaise )
-//            ungrabButton( winId(),  None );
-        ungrabButton( winId(),  ShiftMask );
-        ungrabButton( winId(),  ControlMask );
-        ungrabButton( winId(),  ControlMask | ShiftMask );
+      if ( options->focusPolicy == Options::ClickToFocus ||  !options->clickRaise )
+	ungrabButton( winId(),  None );
+      ungrabButton( winId(),  ShiftMask );
+      ungrabButton( winId(),  ControlMask );
+      ungrabButton( winId(),  ControlMask | ShiftMask );
     } else {
         XGrabButton(qt_xdisplay(), AnyButton, AnyModifier, winId(), FALSE,
                     ButtonPressMask,
@@ -2615,8 +2613,6 @@ bool Client::performMouseCommand( Options::MouseCommand command, QPoint globalPo
             workspace()->raiseClient( this );
         break;
     case Options::MouseActivateAndRaise:
-        // We might already be active, in which case we want to pass the click on
-        replay = isActive();
         workspace()->requestFocus( this );
         workspace()->raiseClient( this );
         break;
@@ -2625,8 +2621,6 @@ bool Client::performMouseCommand( Options::MouseCommand command, QPoint globalPo
         workspace()->lowerClient( this );
         break;
     case Options::MouseActivate:
-        // We might already be active, in which case we want to pass the click on
-        replay = isActive();
         workspace()->requestFocus( this );
         break;
     case Options::MouseActivateRaiseAndPassClick: