diff --git a/.config/emacs/init.org b/.config/emacs/init.org
index bb6b807..7c310c4 100644
--- a/.config/emacs/init.org
+++ b/.config/emacs/init.org
@@ -866,7 +866,6 @@ Fill region is great, except when you don't need it...
     (kbd "SPC t") tab-prefix-map
     (kbd "SPC p") project-prefix-map
     (kbd "SPC q")  'kill-buffer-and-window
-    (kbd "SPC k")  'kill-this-buffer
     (kbd "SPC h")  'help-command
     (kbd "SPC hf") 'helpful-callable
     (kbd "SPC hv") 'helpful-variable
@@ -952,6 +951,11 @@ Fill region is great, except when you don't need it...
       (popper-kill-latest-popup))))
 
 (global-set-key (kbd "C-x k") #'joe/kill-this-buffer-or-popup)
+
+(when (boundp 'evil-mode)
+  (evil-define-key 'normal joe/evil-space-mode-map
+    (kbd "SPC k")  #'joe/kill-this-buffer-or-popup))
+
 (global-set-key (kbd "C-x M-k") #'kill-buffer)
 (require 'all-the-icons-ibuffer)
 (add-hook 'ibuffer-mode-hook #'all-the-icons-ibuffer-mode)