diff --git a/init.el b/init.el
index 5001f03..0929f08 100644
--- a/init.el
+++ b/init.el
@@ -35,7 +35,8 @@
 (setq-default indent-tabs-mode nil)
 
 ;;;; Fix scrolling
-(setq scroll-conservatively 1)
+(setq scroll-conservatively 10000)
+(setq auto-window-vscroll nil)
 
 ;;;; Fix Emacs' definition of a sentence
 (setq sentence-end-double-space nil)