diff --git a/src/events.c b/src/events.c
index d18c7f368a8a6c8850193afc16b2f0950f047149..5b11bd268d7295f6afd9acc9005e211736d8f243 100644
--- a/src/events.c
+++ b/src/events.c
@@ -994,7 +994,7 @@ handleButtonPress (DisplayInfo *display_info, XButtonEvent * ev)
         else if (ev->window == c->window)
         {
             clientPassGrabMouseButton (c);
-            if ((screen_info->params->raise_with_any_button) || (ev->button == Button1))
+            if (((screen_info->params->raise_with_any_button) && (c->type & WINDOW_REGULAR_FOCUSABLE)) || (ev->button == Button1))
             {
                 if (!(c->type & WINDOW_TYPE_DONT_FOCUS))
                 {