diff --git a/lisp/lib/files.el b/lisp/lib/files.el
index 088463293..022be0003 100644
--- a/lisp/lib/files.el
+++ b/lisp/lib/files.el
@@ -495,16 +495,17 @@ If FORCE-P, overwrite the destination file if it exists, without confirmation."
   (interactive)
   (find-file
    (doom--sudo-file-path
-    (or buffer-file-name
+    (or (buffer-file-name (buffer-base-buffer))
         (when (or (derived-mode-p 'dired-mode)
                   (derived-mode-p 'wdired-mode))
-          default-directory)))))
+          default-directory)
+        (user-error "Cannot determine the file path of the current buffer")))))
 
 ;;;###autoload
 (defun doom/sudo-save-buffer ()
   "Save this file as root."
   (interactive)
-  (let ((file (doom--sudo-file-path buffer-file-name)))
+  (let ((file (doom--sudo-file-path (buffer-file-name (buffer-base-buffer)))))
     (if-let (buffer (find-file-noselect file))
         (let ((origin (current-buffer)))
           (copy-to-buffer buffer (point-min) (point-max))