diff --git a/events.cpp b/events.cpp
index d419dbc684..577f9f6527 100644
--- a/events.cpp
+++ b/events.cpp
@@ -1230,7 +1230,7 @@ bool Client::buttonPressEvent( Window w, int button, int state, int x, int y, in
             }
         else
             { // inactive inner window
-            if( !isActive() && w == wrapperId() && button < 4 )
+            if( !isActive() && w == wrapperId())
                 {
                 was_action = true;
                 perform_handled = true;
@@ -1245,6 +1245,8 @@ bool Client::buttonPressEvent( Window w, int button, int state, int x, int y, in
                     case Button3:
                         com = options->commandWindow3();
                         break;
+                    default:
+                        com = Options::MouseActivateAndPassClick;
                     }
                 }
             // active inner window