diff --git a/modules/feature/spellcheck/config.el b/modules/feature/spellcheck/config.el
index 32b5c6220..72bda1ade 100644
--- a/modules/feature/spellcheck/config.el
+++ b/modules/feature/spellcheck/config.el
@@ -2,7 +2,17 @@
 
 (@def-package flyspell ; built-in
   :commands flyspell-mode
-  :init (@add-hook text-mode 'flyspell-mode))
+  :init
+  (add-hook 'text-mode-hook 'flyspell-mode)
+  :config
+  (setq ispell-program-name (executable-find "aspell")
+        ispell-list-command "--list"
+        ispell-extr-args '("--dont-tex-check-comments"))
+
+  (@map :map flyspell-mode-map
+        :localleader
+        :n "s" 'flyspell-correct-word-generic
+        :n "S" 'flyspell-correct-previous-word-generic))
 
 
 (@def-package flyspell-correct
@@ -14,18 +24,5 @@
   :after flyspell-correct
   :config
   (setq flyspell-popup-correct-delay 0.8)
-  (add-hook 'flyspell-mode-hook 'flyspell-popup-auto-correct-mode))
-
-
-(@def-package flyspell-correct-ivy
-  :when (@featurep :completion ivy)
-  :after flyspell-correct)
-
-(@def-package flyspell-correct-helm
-  :when (@featurep :completion helm)
-  :after flyspell-correct)
-
-(@def-package flyspell-correct-ido
-  :when (@featurep :emacs ido)
-  :after flyspell-correct)
+  (define-key popup-menu-keymap [escape] 'keyboard-quit))
 
diff --git a/modules/feature/spellcheck/packages.el b/modules/feature/spellcheck/packages.el
index 9a665ac52..133772231 100644
--- a/modules/feature/spellcheck/packages.el
+++ b/modules/feature/spellcheck/packages.el
@@ -4,11 +4,3 @@
 (@package flyspell-correct)
 (@package flyspell-correct-popup)
 
-(cond ((@featurep :completion ivy)
-       (@package flyspell-correct-ivy))
-      ((@featurep :completion helm)
-       (@package flyspell-correct-helm))
-      ((@featurep :emacs ido)
-       (@package flyspell-correct-ido)))
-
-