diff --git a/src/joybuttontypes/joygradientbutton.cpp b/src/joybuttontypes/joygradientbutton.cpp
index 48d66d343..8e55acf0f 100644
--- a/src/joybuttontypes/joygradientbutton.cpp
+++ b/src/joybuttontypes/joygradientbutton.cpp
@@ -453,7 +453,7 @@ void JoyGradientButton::wheelEventHorizontal()
 
             tempInterval = qMin(tempInterval, 5);
 
-            if (!mouseWheelHorizontalEventTimer.isActive() || (mouseWheelVerticalEventTimer.interval() != tempInterval))
+            if (!mouseWheelHorizontalEventTimer.isActive() || (mouseWheelHorizontalEventTimer.interval() != tempInterval))
             {
                 mouseWheelHorizontalEventTimer.start(tempInterval);
             }
@@ -469,11 +469,14 @@ void JoyGradientButton::wheelEventHorizontal()
             buttonslot = mouseWheelHorizontalEventQueue.dequeue();
             bool isActive = getActiveSlots().contains(buttonslot);
 
-            if (isActive)
+            if (isActive && activateEvent)
             {
                 sendevent(buttonslot, true);
                 sendevent(buttonslot, false);
                 tempQueue.enqueue(buttonslot);
+            } else if (isActive)
+            {
+                tempQueue.enqueue(buttonslot);
             }
         }
 
@@ -492,7 +495,7 @@ void JoyGradientButton::wheelEventHorizontal()
 
             tempInterval = qMin(tempInterval, 5);
 
-            if (!mouseWheelHorizontalEventTimer.isActive() || (mouseWheelVerticalEventTimer.interval() != tempInterval))
+            if (!mouseWheelHorizontalEventTimer.isActive() || (mouseWheelHorizontalEventTimer.interval() != tempInterval))
             {
                 mouseWheelHorizontalEventTimer.start(tempInterval);
             }