diff --git a/behavior.el b/behavior.el
index 40b0726..e70a98b 100644
--- a/behavior.el
+++ b/behavior.el
@@ -67,11 +67,13 @@
 (setq reb-re-syntax 'string)
 
 ;; smoother scrolling (less "jumpy" than defaults)
-(setq mouse-wheel-scroll-amount '(2 ((shift) . 10)) ;; two lines at a time
-      mouse-wheel-progressive-speed nil ;; don't accelerate scrolling
+(setq redisplay-dont-pause t
+      mouse-wheel-scroll-amount '(1 ((shift) . 10)) ;; one line at a time
       mouse-wheel-follow-mouse 't ;; scroll window under mouse
-      scroll-step 1 ;; keyboard scroll one line at a time
-      scroll-margin 0)
+      scroll-margin 1
+      scroll-step 1
+      scroll-conservatively 10000
+      scroll-preserve-screen-position 1)
 
 ;; Enable mouse support when running in a console
 (unless window-system