diff --git a/core/core-editor.el b/core/core-editor.el
index 1eb996773..fbcff3b53 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -13,7 +13,7 @@
 
  ;; Sane scroll settings
  scroll-margin           0
- scroll-conservatively   101
+ scroll-conservatively   1001
  scroll-preserve-screen-position t
 
  shift-select-mode       nil
diff --git a/core/core-os-osx.el b/core/core-os-osx.el
index 8e91edb84..7225cef86 100644
--- a/core/core-os-osx.el
+++ b/core/core-os-osx.el
@@ -13,7 +13,10 @@
       ;; Don't open files from the workspace in a new frame
       ns-pop-up-frames nil
       ;; smooth scrolling is slow
-      mac-mouse-wheel-smooth-scroll nil)
+      mac-mouse-wheel-smooth-scroll nil
+
+      mouse-wheel-scroll-amount '(2 ((shift) . 6))  ;; one line at a time
+      mouse-wheel-progressive-speed nil)            ;; don't accelerate scrolling
 
 ;; fix emacs PATH on OSX (GUI only)
 (when window-system