# xfwm4-4.12.4
--- a/src/events.c	2017-03-16 08:52:08.000000000 +0100
+++ b/src/events.c	2017-05-28 11:32:23.016398312 +0200
@@ -1041,7 +1041,9 @@
         else if (ev->window == c->window)
         {
             replay = TRUE;
-            if (((screen_info->params->raise_with_any_button) && (c->type & WINDOW_REGULAR_FOCUSABLE)) || (ev->button == Button1))
+            if (((screen_info->params->raise_with_any_button) && (c->type & WINDOW_REGULAR_FOCUSABLE)
+                && !((ev->button == Button4) || (ev->button == Button5)))
+                || ((ev->button == Button1) || (ev->button == Button2) || (ev->button == Button3)))
             {
                 if (!(c->type & WINDOW_TYPE_DONT_FOCUS))
                 {
--- a/src/focus.c	2017-03-16 08:52:08.000000000 +0100
+++ b/src/focus.c	2017-05-28 11:20:56.273553478 +0200
@@ -703,6 +703,8 @@
     else
     {
         grabButton(clientGetXDisplay (c), Button1, AnyModifier, c->window);
+        grabButton(clientGetXDisplay (c), Button2, AnyModifier, c->window);
+        grabButton(clientGetXDisplay (c), Button3, AnyModifier, c->window);
     }
 }