diff --git a/.emacs.d/lisp/init-elfeed.el b/.emacs.d/lisp/init-elfeed.el
index 4d6ccee8..9998301f 100644
--- a/.emacs.d/lisp/init-elfeed.el
+++ b/.emacs.d/lisp/init-elfeed.el
@@ -31,15 +31,18 @@ whether how to visit the link.")
   "Visit with external function if entry link matches `ambrevar/elfeed-visit-patterns',
 visit otherwise."
   (interactive)
-  (let ((entry (if (eq major-mode 'elfeed-show-mode) elfeed-show-entry (elfeed-search-selected :single)))
+  (let ((entry (if (eq major-mode 'elfeed-show-mode)
+                   elfeed-show-entry
+                 (elfeed-search-selected :single)))
         (patterns ambrevar/elfeed-visit-patterns))
     (while (and patterns (not (string-match (caar patterns) (elfeed-entry-link entry))))
       (setq patterns (cdr patterns)))
-    (if patterns
-        (funcall (cdar patterns))
-      (if (eq major-mode 'elfeed-search-mode)
-          (elfeed-search-browse-url)
-        (elfeed-show-visit)))))
+    (cond
+     (patterns
+      (funcall (cdar patterns)))
+     ((eq major-mode 'elfeed-search-mode)
+      (elfeed-search-show-entry))
+     (t (elfeed-show-visit)))))
 
 (define-key elfeed-search-mode-map "v" #'elfeed-play-in-mpv)
 
diff --git a/.emacs.d/lisp/init-evil.el b/.emacs.d/lisp/init-evil.el
index 7431c6b8..b3579346 100644
--- a/.emacs.d/lisp/init-evil.el
+++ b/.emacs.d/lisp/init-evil.el
@@ -109,9 +109,10 @@
 (with-eval-after-load 'elfeed
   ;; Custom
   (evil-define-key 'normal elfeed-search-mode-map
-    (kbd "S-<return>") 'ambrevar/elfeed-visit-maybe-external)
-  (evil-define-key 'normal elfeed-show-mode-map
-    (kbd "S-<return>") 'ambrevar/elfeed-visit-maybe-external)
+    (kbd "S-<return>") 'elfeed-search-show-entry
+    (kbd "<return>") 'ambrevar/elfeed-visit-maybe-external)
+  ;; (evil-define-key 'normal elfeed-show-mode-map
+  ;;   (kbd "S-<return>") 'ambrevar/elfeed-visit-maybe-external)
   (evil-define-key 'normal elfeed-show-mode-map
     (kbd "q") 'ambrevar/elfeed-kill-entry))