diff --git a/core/autoload/buffers.el b/core/autoload/buffers.el
index 62f44a7d9..c6b715960 100644
--- a/core/autoload/buffers.el
+++ b/core/autoload/buffers.el
@@ -264,6 +264,13 @@ See `doom-real-buffer-p' for an explanation for real buffers."
 ;;
 ;; Interactive commands
 
+;;;###autoload
+(defun doom/save-and-kill-buffer ()
+  "Save the current buffer to file, then kill it."
+  (interactive)
+  (save-buffer)
+  (kill-current-buffer))
+
 ;;;###autoload
 (defun doom/kill-this-buffer-in-all-windows (buffer &optional dont-save)
   "Kill BUFFER globally and ensure all windows previously showing this buffer
diff --git a/modules/editor/evil/config.el b/modules/editor/evil/config.el
index ed63c71eb..19c7ce387 100644
--- a/modules/editor/evil/config.el
+++ b/modules/editor/evil/config.el
@@ -469,7 +469,7 @@ directives. By default, this only recognizes C directives.")
       :nv "zn"    #'+evil:narrow-buffer
       :n  "zN"    #'doom/widen-indirectly-narrowed-buffer
       :n  "zx"    #'kill-current-buffer
-      :n  "ZX"    #'bury-buffer
+      :n  "ZX"    #'doom/save-and-kill-buffer
       ;; don't leave visual mode after shifting
       :v  "<"     #'+evil/visual-dedent  ; vnoremap < <gv
       :v  ">"     #'+evil/visual-indent  ; vnoremap > >gv