diff --git a/share/functions/edit_command_buffer.fish b/share/functions/edit_command_buffer.fish
index 423816190..6ea2b0d2c 100644
--- a/share/functions/edit_command_buffer.fish
+++ b/share/functions/edit_command_buffer.fish
@@ -18,11 +18,11 @@ function edit_command_buffer --description 'Edit the command buffer in an extern
     commandline -b >$f
     if set -q VISUAL
         __fish_disable_bracketed_paste
-        $VISUAL $f
+        eval $VISUAL $f
         __fish_enable_bracketed_paste
     else if set -q EDITOR
         __fish_disable_bracketed_paste
-        $EDITOR $f
+        eval $EDITOR $f
         __fish_enable_bracketed_paste
     else
         echo