diff --git a/spec/text-editor-component-spec.coffee b/spec/text-editor-component-spec.coffee
index 2d38dca96..374fab15f 100644
--- a/spec/text-editor-component-spec.coffee
+++ b/spec/text-editor-component-spec.coffee
@@ -2691,7 +2691,54 @@ describe "TextEditorComponent", ->
 
         expect(componentNode.contains(lineNumberNode)).toBe true
 
-    it "only prevents the default action of the mousewheel event if it actually lead to scrolling", ->
+    it "prevents the default action of mousewheel events for normal editors", ->
+      spyOn(WheelEvent::, 'preventDefault').andCallThrough()
+
+      wrapperNode.style.height = 4.5 * lineHeightInPixels + 'px'
+      wrapperNode.style.width = 20 * charWidth + 'px'
+      component.measureDimensions()
+      nextAnimationFrame()
+
+      # try to scroll past the top, which is impossible
+      componentNode.dispatchEvent(new WheelEvent('mousewheel', wheelDeltaX: 0, wheelDeltaY: 50))
+      expect(wrapperNode.getScrollTop()).toBe 0
+      expect(WheelEvent::preventDefault).toHaveBeenCalled()
+      WheelEvent::preventDefault.reset()
+
+      # scroll to the bottom in one huge event
+      componentNode.dispatchEvent(new WheelEvent('mousewheel', wheelDeltaX: 0, wheelDeltaY: -3000))
+      nextAnimationFrame()
+      maxScrollTop = wrapperNode.getScrollTop()
+      expect(WheelEvent::preventDefault).toHaveBeenCalled()
+      WheelEvent::preventDefault.reset()
+
+      # try to scroll past the bottom, which is impossible
+      componentNode.dispatchEvent(new WheelEvent('mousewheel', wheelDeltaX: 0, wheelDeltaY: -30))
+      expect(wrapperNode.getScrollTop()).toBe maxScrollTop
+      expect(WheelEvent::preventDefault).toHaveBeenCalled()
+      WheelEvent::preventDefault.reset()
+
+      # try to scroll past the left side, which is impossible
+      componentNode.dispatchEvent(new WheelEvent('mousewheel', wheelDeltaX: 50, wheelDeltaY: 0))
+      expect(wrapperNode.getScrollLeft()).toBe 0
+      expect(WheelEvent::preventDefault).toHaveBeenCalled()
+      WheelEvent::preventDefault.reset()
+
+      # scroll all the way right
+      componentNode.dispatchEvent(new WheelEvent('mousewheel', wheelDeltaX: -3000, wheelDeltaY: 0))
+      nextAnimationFrame()
+      maxScrollLeft = wrapperNode.getScrollLeft()
+      expect(WheelEvent::preventDefault).toHaveBeenCalled()
+      WheelEvent::preventDefault.reset()
+
+      # try to scroll past the right side, which is impossible
+      componentNode.dispatchEvent(new WheelEvent('mousewheel', wheelDeltaX: -30, wheelDeltaY: 0))
+      expect(wrapperNode.getScrollLeft()).toBe maxScrollLeft
+      expect(WheelEvent::preventDefault).toHaveBeenCalled()
+
+    it "doesn't prevent the default action of mousewheel events for mini editors", ->
+      editor.setMini(true)
+
       spyOn(WheelEvent::, 'preventDefault').andCallThrough()
 
       wrapperNode.style.height = 4.5 * lineHeightInPixels + 'px'
@@ -2708,8 +2755,7 @@ describe "TextEditorComponent", ->
       componentNode.dispatchEvent(new WheelEvent('mousewheel', wheelDeltaX: 0, wheelDeltaY: -3000))
       nextAnimationFrame()
       maxScrollTop = wrapperNode.getScrollTop()
-      expect(WheelEvent::preventDefault).toHaveBeenCalled()
-      WheelEvent::preventDefault.reset()
+      expect(WheelEvent::preventDefault).not.toHaveBeenCalled()
 
       # try to scroll past the bottom, which is impossible
       componentNode.dispatchEvent(new WheelEvent('mousewheel', wheelDeltaX: 0, wheelDeltaY: -30))
@@ -2725,8 +2771,7 @@ describe "TextEditorComponent", ->
       componentNode.dispatchEvent(new WheelEvent('mousewheel', wheelDeltaX: -3000, wheelDeltaY: 0))
       nextAnimationFrame()
       maxScrollLeft = wrapperNode.getScrollLeft()
-      expect(WheelEvent::preventDefault).toHaveBeenCalled()
-      WheelEvent::preventDefault.reset()
+      expect(WheelEvent::preventDefault).not.toHaveBeenCalled()
 
       # try to scroll past the right side, which is impossible
       componentNode.dispatchEvent(new WheelEvent('mousewheel', wheelDeltaX: -30, wheelDeltaY: 0))
diff --git a/src/text-editor-component.coffee b/src/text-editor-component.coffee
index 48aeb16e9..f06e0c339 100644
--- a/src/text-editor-component.coffee
+++ b/src/text-editor-component.coffee
@@ -328,6 +328,8 @@ class TextEditorComponent
         @pendingScrollLeft = null
 
   onMouseWheel: (event) =>
+    event.preventDefault() unless @editor.isMini()
+
     # Only scroll in one direction at a time
     {wheelDeltaX, wheelDeltaY} = event
 
@@ -344,13 +346,11 @@ class TextEditorComponent
       # Scrolling horizontally
       previousScrollLeft = @presenter.getScrollLeft()
       @presenter.setScrollLeft(previousScrollLeft - Math.round(wheelDeltaX * @scrollSensitivity))
-      event.preventDefault() unless previousScrollLeft is @presenter.getScrollLeft()
     else
       # Scrolling vertically
       @presenter.setMouseWheelScreenRow(@screenRowForNode(event.target))
       previousScrollTop = @presenter.getScrollTop()
       @presenter.setScrollTop(previousScrollTop - Math.round(wheelDeltaY * @scrollSensitivity))
-      event.preventDefault() unless previousScrollTop is @presenter.getScrollTop()
 
   onScrollViewScroll: =>
     if @mounted