diff --git a/emacs.d/ui.el b/emacs.d/ui.el
index 95886e7..409bc0f 100644
--- a/emacs.d/ui.el
+++ b/emacs.d/ui.el
@@ -165,28 +165,11 @@
   (popper-mode t)
   (popper-echo-mode t))
 
-(defcustom gered/buffer-name-skip-regexp
-  (rx bos
-      (or "*Backtrace*"
-          "*Compile-Log*"
-          "*Completions*"
-          "*Messages*"
-          "*package*"
-          "*Warnings*"
-          "*Async-native-compile-log*")
-      eos)
-  "Regular expression matching buffer names to be ignored by `next-buffer' and `previous-buffer'"
-  :type 'regexp)
-
-(defcustom gered/buffer-mode-skip-regexp
-  (rx bos
-      (or "dired-sidebar-mode")
-      eos)
-  "Regular expression matching buffer major modes to be ignored by `next-buffer' and `previous-buffer'"
-  :type 'regexp)
-
 (defun gered/buffer-skip-p (window buffer bury-or-kill)
-  (or (string-match-p gered/buffer-name-skip-regexp (buffer-name buffer))
-      (string-match-p gered/buffer-mode-skip-regexp (symbol-name (buffer-mode buffer)))))
+  (let ((buf-name (buffer-name buffer))
+        (buf-mode (symbol-name (buffer-mode buffer))))
+    (or
+     (string-match "\\*[^*]+\\*" buf-name)
+     (string= "dired-sidebar-mode" buf-mode))))
 
 (setq switch-to-prev-buffer-skip 'gered/buffer-skip-p)