diff --git a/quickshell/Modules/DankBar/DankBarWindow.qml b/quickshell/Modules/DankBar/DankBarWindow.qml
index 08e4201e..5357d7b4 100644
--- a/quickshell/Modules/DankBar/DankBarWindow.qml
+++ b/quickshell/Modules/DankBar/DankBarWindow.qml
@@ -666,9 +666,10 @@ PanelWindow {
                         propagateComposedEvents: true
                         z: -1
 
-                        property real scrollAccumulatorY: 0
-                        property real scrollAccumulatorX: 0
-                        property real touchpadThreshold: 500
+                        property real touchpadAccumulatorY: 0
+                        property real touchpadAccumulatorX: 0
+                        property real mouseAccumulatorY: 0
+                        property real mouseAccumulatorX: 0
                         property bool actionInProgress: false
 
                         Timer {
@@ -696,44 +697,39 @@ PanelWindow {
                         }
 
                         onWheel: wheel => {
-                            if (!(barConfig?.scrollEnabled ?? true)) {
-                                wheel.accepted = false;
-                                return;
-                            }
-
-                            if (actionInProgress) {
+                            if (!(barConfig?.scrollEnabled ?? true) || actionInProgress) {
                                 wheel.accepted = false;
                                 return;
                             }
 
                             const deltaY = wheel.angleDelta.y;
                             const deltaX = wheel.angleDelta.x;
-                            const hasPixelY = wheel.pixelDelta && wheel.pixelDelta.y !== 0;
-                            const hasPixelX = wheel.pixelDelta && wheel.pixelDelta.x !== 0;
+                            const isTouchpadY = wheel.pixelDelta && wheel.pixelDelta.y !== 0;
+                            const isTouchpadX = wheel.pixelDelta && wheel.pixelDelta.x !== 0;
                             const xBehavior = barConfig?.scrollXBehavior ?? "column";
                             const yBehavior = barConfig?.scrollYBehavior ?? "workspace";
+                            const reverse = SettingsData.reverseScrolling ? -1 : 1;
 
                             if (CompositorService.isNiri && xBehavior !== "none" && Math.abs(deltaX) > Math.abs(deltaY)) {
-                                const isTraditionalMouse = !hasPixelX && Math.abs(deltaX) >= 120 && (Math.abs(deltaX) % 120) === 0;
-                                const isHighDpiMouse = !hasPixelX && !isTraditionalMouse && deltaX !== 0;
-                                const reverse = SettingsData.reverseScrolling ? -1 : 1;
-                                const direction = deltaX * reverse < 0 ? 1 : -1;
-
-                                if (isTraditionalMouse || isHighDpiMouse) {
-                                    if (handleScrollAction(xBehavior, direction)) {
-                                        actionInProgress = true;
-                                        cooldownTimer.restart();
-                                        scrollAccumulatorX = 0;
-                                    }
-                                } else {
-                                    scrollAccumulatorX += deltaX;
-                                    if (Math.abs(scrollAccumulatorX) >= touchpadThreshold) {
-                                        const touchDirection = scrollAccumulatorX < 0 ? 1 : -1;
-                                        if (handleScrollAction(xBehavior, touchDirection)) {
+                                if (isTouchpadX) {
+                                    touchpadAccumulatorX += deltaX;
+                                    if (Math.abs(touchpadAccumulatorX) >= 500) {
+                                        const direction = touchpadAccumulatorX * reverse < 0 ? 1 : -1;
+                                        if (handleScrollAction(xBehavior, direction)) {
                                             actionInProgress = true;
                                             cooldownTimer.restart();
                                         }
-                                        scrollAccumulatorX = 0;
+                                        touchpadAccumulatorX = 0;
+                                    }
+                                } else {
+                                    mouseAccumulatorX += deltaX;
+                                    if (Math.abs(mouseAccumulatorX) >= 120) {
+                                        const direction = mouseAccumulatorX * reverse < 0 ? 1 : -1;
+                                        if (handleScrollAction(xBehavior, direction)) {
+                                            actionInProgress = true;
+                                            cooldownTimer.restart();
+                                        }
+                                        mouseAccumulatorX = 0;
                                     }
                                 }
                                 wheel.accepted = false;
@@ -745,26 +741,25 @@ PanelWindow {
                                 return;
                             }
 
-                            const isTraditionalMouse = !hasPixelY && Math.abs(deltaY) >= 120 && (Math.abs(deltaY) % 120) === 0;
-                            const isHighDpiMouse = !hasPixelY && !isTraditionalMouse && deltaY !== 0;
-                            const reverse = SettingsData.reverseScrolling ? -1 : 1;
-                            const direction = deltaY * reverse < 0 ? 1 : -1;
-
-                            if (isTraditionalMouse || isHighDpiMouse) {
-                                if (handleScrollAction(yBehavior, direction)) {
-                                    actionInProgress = true;
-                                    cooldownTimer.restart();
-                                    scrollAccumulatorY = 0;
-                                }
-                            } else {
-                                scrollAccumulatorY += deltaY;
-                                if (Math.abs(scrollAccumulatorY) >= touchpadThreshold) {
-                                    const touchDirection = scrollAccumulatorY < 0 ? 1 : -1;
-                                    if (handleScrollAction(yBehavior, touchDirection)) {
+                            if (isTouchpadY) {
+                                touchpadAccumulatorY += deltaY;
+                                if (Math.abs(touchpadAccumulatorY) >= 500) {
+                                    const direction = touchpadAccumulatorY * reverse < 0 ? 1 : -1;
+                                    if (handleScrollAction(yBehavior, direction)) {
                                         actionInProgress = true;
                                         cooldownTimer.restart();
                                     }
-                                    scrollAccumulatorY = 0;
+                                    touchpadAccumulatorY = 0;
+                                }
+                            } else {
+                                mouseAccumulatorY += deltaY;
+                                if (Math.abs(mouseAccumulatorY) >= 120) {
+                                    const direction = mouseAccumulatorY * reverse < 0 ? 1 : -1;
+                                    if (handleScrollAction(yBehavior, direction)) {
+                                        actionInProgress = true;
+                                        cooldownTimer.restart();
+                                    }
+                                    mouseAccumulatorY = 0;
                                 }
                             }
 
diff --git a/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml b/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
index a2b2643d..110e180e 100644
--- a/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
+++ b/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
@@ -649,8 +649,8 @@ Item {
         anchors.fill: parent
         acceptedButtons: Qt.RightButton
 
-        property real scrollAccumulator: 0
-        property real touchpadThreshold: 500
+        property real touchpadAccumulator: 0
+        property real mouseAccumulator: 0
         property bool scrollInProgress: false
 
         Timer {
@@ -674,28 +674,29 @@ Item {
                 return;
 
             const delta = wheel.angleDelta.y;
-            const hasPixel = wheel.pixelDelta && wheel.pixelDelta.y !== 0;
-            const isTraditionalMouse = !hasPixel && Math.abs(delta) >= 120 && (Math.abs(delta) % 120) === 0;
-            const isHighDpiMouse = !hasPixel && !isTraditionalMouse && delta !== 0;
+            const isTouchpad = wheel.pixelDelta && wheel.pixelDelta.y !== 0;
             const reverse = SettingsData.reverseScrolling ? -1 : 1;
-            const direction = delta * reverse < 0 ? 1 : -1;
 
-            if (isTraditionalMouse || isHighDpiMouse) {
+            if (isTouchpad) {
+                touchpadAccumulator += delta;
+                if (Math.abs(touchpadAccumulator) < 500)
+                    return;
+                const direction = touchpadAccumulator * reverse < 0 ? 1 : -1;
                 root.switchWorkspace(direction);
                 scrollInProgress = true;
                 scrollCooldown.restart();
-                scrollAccumulator = 0;
+                touchpadAccumulator = 0;
                 return;
             }
 
-            scrollAccumulator += delta;
-            if (Math.abs(scrollAccumulator) >= touchpadThreshold) {
-                const touchDirection = scrollAccumulator < 0 ? 1 : -1;
-                root.switchWorkspace(touchDirection);
-                scrollInProgress = true;
-                scrollCooldown.restart();
-                scrollAccumulator = 0;
-            }
+            mouseAccumulator += delta;
+            if (Math.abs(mouseAccumulator) < 120)
+                return;
+            const direction = mouseAccumulator * reverse < 0 ? 1 : -1;
+            root.switchWorkspace(direction);
+            scrollInProgress = true;
+            scrollCooldown.restart();
+            mouseAccumulator = 0;
         }
     }