diff --git a/spacemacs/packages.el b/spacemacs/packages.el
index 1a22a8345..c432821a1 100644
--- a/spacemacs/packages.el
+++ b/spacemacs/packages.el
@@ -2671,9 +2671,12 @@ It is a string holding:
   ;; this is not a conventional package
   ;; no require are needed for this package everything is auto-loaded
   (if dotspacemacs-smooth-scrolling
-      (setq smooth-scroll-margin 5
-            scroll-conservatively 9999
-            scroll-step 1)
+      ;; enable smooth scrolling
+      (setq scroll-step 1
+            scroll-conservatively 10000
+            auto-window-vscroll nil
+            smooth-scroll-margin 5)
+
     ;; deactivate the defadvice's
     (ad-disable-advice 'previous-line 'after 'smooth-scroll-down)
     (ad-activate 'previous-line)