diff --git a/core/core-editor.el b/core/core-editor.el
index d004835e0..ad1e11296 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -75,9 +75,14 @@
 
 ;; window config undo/redo
 (setq winner-dont-bind-my-keys t)
+(require 'winner)
+;; Ignore all special buffers
+(advice-add 'winner-window-list :filter-return 'doom*winner-window-list)
+(defun doom*winner-window-list (windows)
+  (-remove (lambda (win) (string-match-p "^\\s-*\\*" (buffer-name (window-buffer win))))
+           windows))
 (winner-mode 1)
-(add-hook! after-init
-  (setq winner-boring-buffers doom-ignore-buffers))
+
 
 ;; Let editorconfig handle global whitespace settings
 (use-package editorconfig :demand t
diff --git a/core/core.el b/core/core.el
index 8038e8751..4aa435ab7 100644
--- a/core/core.el
+++ b/core/core.el
@@ -45,23 +45,6 @@
 ignored when using `doom:next-real-buffer' and `doom:previous-real-buffer' (or
 killed by `doom/kill-unreal-buffers', or after `doom/kill-real-buffer').")
 
-(defvar doom-ignore-buffers
-  '("*Messages*" "*eval*" "*Completions*" "*Compile-Log*" "*inferior-lisp*"
-    "*Fuzzy Completions*" "*Apropos*" "*Help*" "*cvs*" "*Buffer List*"
-    "*Ibuffer*" " *NeoTree*" "*NeoTree*" "*esh command on file*" "*WoMan-Log*"
-    "*compilation*" "*use-package*" "*quickrun*" "*eclim: problems*"
-    "*Flycheck errors*" "*popwin-dummy*"
-    ;; Helm
-    ;; "*helm*" "*helm recentf*" "*helm projectile*" "*helm imenu*"
-    ;; "*helm company*" "*helm buffers*" "*Helm Css SCSS*" "*helm-ag*"
-    ;; "*helm-ag-edit*" "*Helm Swoop*" "*helm M-x*" "*helm mini*"
-    ;; "*Helm Completions*" "*Helm Find Files*" "*helm mu*"
-    ;; "*helm mu contacts*" "*helm-mode-describe-variable*"
-    ;; "*helm-mode-describe-function*"
-    ;; Org
-    "*Org todo*" "*Org Links*" "*Agenda Commands*")
-  "List of buffer names to ignore when using `winner-undo', or `winner-redo'")
-
 (defvar doom-cleanup-processes-alist
   '(("pry" . ruby-mode)
     ("irb" . ruby-mode)