diff --git a/emacs/init.org b/emacs/init.org
index f32d19d..547c9ac 100755
--- a/emacs/init.org
+++ b/emacs/init.org
@@ -327,7 +327,12 @@ A framework for creating Magit-style popups:
 Magit is objectively the best Git interface.
 #+BEGIN_SRC emacs-lisp
   (use-package magit
-    :commands (magit-status magit-blame magit-find-file magit-name-local-branch))
+    :commands (magit-status
+               magit-blame
+               magit-find-file
+               magit-name-local-branch)
+    :config
+    (require 'evil-magit))
 #+END_SRC
 
 #+BEGIN_SRC emacs-lisp
@@ -348,11 +353,15 @@ Use ido-mode for completion within Magit:
   (use-package forge
     :after (magit)
     :config
-    (add-to-list 'forge-alist '("git.jeremydormitzer.com" "git.jeremydormitzer.com/api/v1"
-				"git.jeremydormitzer.com" forge-gitea-repository))
-    (add-to-list 'evil-emacs-state-modes 'forge-topic-list-mode)
+    (add-to-list 'forge-alist '("git.jeremydormitzer.com"
+                                "git.jeremydormitzer.com/api/v1"
+                                "git.jeremydormitzer.com"
+                                forge-gitea-repository))
     :general
-    (forge-topic-list-mode-map "SPC" leader-map))
+    ((normal motion) magit-mode-map "yu" #'forge-copy-url-at-point-as-kill)
+    ((normal motion visual) forge-topic-list-mode-map
+     "y" #'forge-copy-url-at-point-as-kill
+     "q" #'quit-window))
 #+END_SRC
 
 ** evil-magit