diff --git a/modules/system/assets/ui/js/drag.scroll.js b/modules/system/assets/ui/js/drag.scroll.js
index ba2864b57..a605f7777 100644
--- a/modules/system/assets/ui/js/drag.scroll.js
+++ b/modules/system/assets/ui/js/drag.scroll.js
@@ -67,9 +67,19 @@
             if (!self.options.allowScroll)
                 return;
 
-            var offset = self.options.vertical
-                ? ((event.deltaFactor * event.deltaY) * -1)
-                : (event.deltaFactor * event.deltaX)
+            var offset,
+                offsetX = event.deltaFactor * event.deltaX,
+                offsetY = event.deltaFactor * event.deltaY
+
+            if (!offsetX) {
+                offset = offsetY * -1
+            }
+            else if (!offsetY) {
+                offset = offsetX
+            }
+            else {
+                offset = self.options.vertical ? (offsetY * -1) : offsetX
+            }
 
             return !scrollWheel(offset)
         })
diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js
index 042738ac7..b80a663a3 100644
--- a/modules/system/assets/ui/storm-min.js
+++ b/modules/system/assets/ui/storm-min.js
@@ -3046,7 +3046,10 @@ this.scrollClassContainer=this.options.scrollClassContainer?$(this.options.scrol
 Base.call(this)
 if(this.options.scrollMarkerContainer){$(this.options.scrollMarkerContainer).append($('<span class="before scroll-marker"></span><span class="after scroll-marker"></span>'))}
 $el.mousewheel(function(event){if(!self.options.allowScroll)
-return;var offset=self.options.vertical?((event.deltaFactor*event.deltaY)*-1):(event.deltaFactor*event.deltaX)
+return;var offset,offsetX=event.deltaFactor*event.deltaX,offsetY=event.deltaFactor*event.deltaY
+if(!offsetX){offset=offsetY*-1}
+else if(!offsetY){offset=offsetX}
+else{offset=self.options.vertical?(offsetY*-1):offsetX}
 return!scrollWheel(offset)})
 if(!options.noDragSupport){$el.on('mousedown.dragScroll',function(event){if(event.target&&event.target.tagName==='INPUT')
 return