diff --git a/core/core-ui.el b/core/core-ui.el
index d9dd1d099..c795e477e 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -391,6 +391,13 @@ treat Emacs as a non-application window."
         (set-window-configuration doom--ediff-saved-wconf)))))
 
 
+(use-package! goto-addr
+  :hook (text-mode . goto-address-mode)
+  :hook (prog-mode . goto-address-prog-mode)
+  :config
+  (define-key goto-address-highlight-keymap (kbd "RET") #'goto-address-at-point))
+
+
 (use-package! hl-line
   ;; Highlights the current line
   :hook ((prog-mode text-mode conf-mode) . hl-line-mode)