diff --git a/user/app/emacs/init.el b/user/app/emacs/init.el
index 95698955..a7ce03c0 100644
--- a/user/app/emacs/init.el
+++ b/user/app/emacs/init.el
@@ -165,6 +165,12 @@
   (setq evil-undo-system 'undo-fu)
   (evil-mode 1))
 
+(with-eval-after-load 'evil-maps
+  (define-key evil-motion-state-map (kbd "RET") nil))
+
+(setq org-return-follows-link t)
+(setf (cdr (assoc 'file org-link-frame-setup)) 'find-file)
+
 (use-package evil-collection
   :init
   (setq evil-want-keybinding nil)