diff --git a/sudo-write.kak b/sudo-write.kak
index 1241c19..e9048d9 100644
--- a/sudo-write.kak
+++ b/sudo-write.kak
@@ -3,22 +3,22 @@
 
 define-command -hidden sudo-write-impl %{
     eval -save-regs f %{
-        set-register f %sh{ mktemp --tmpdir XXXXX }
+        reg f %sh{ mktemp --tmpdir XXXXX }
         write %reg{f}
-        %sh{
-            sudo -n -- dd if="$kak_reg_f" of="$kak_buffile" >/dev/null 2>&1
+        eval %sh{
+            sudo -n -- dd if="$kak_main_reg_f" of="$kak_buffile" >/dev/null 2>&1
             if [ $? -eq 0 ]; then
                 echo "edit!"
             else
                 echo "echo -markup '{Error}Something went wrong'"
             fi
-            rm -f "$kak_reg_f"
+            rm -f "$kak_main_reg_f"
         }
     }
 }
 
 define-command -hidden -params 1 sudo-cache-password %{
-    eval -no-hooks -draft %{
+    eval -save-regs '"' -no-hooks -draft %{
         edit -scratch *sudo_write_pass*
         reg '"' %arg{1}
         exec "<a-p>|sudo -S echo ok<ret>"