diff --git a/share/functions/fish_default_key_bindings.fish b/share/functions/fish_default_key_bindings.fish
index 5bf00b216..73583c5a7 100644
--- a/share/functions/fish_default_key_bindings.fish
+++ b/share/functions/fish_default_key_bindings.fish
@@ -32,7 +32,7 @@ function fish_default_key_bindings -d "Default (Emacs-like) key bindings for fis
     or exit # protect against invalid $argv
 
     # Space expands abbrs _and_ inserts itself.
-    bind --preset $argv " " 'commandline -i " "; commandline -f expand-abbr'
+    bind --preset $argv " " self-insert expand-abbr
 
     bind --preset $argv \n execute
     bind --preset $argv \r execute
diff --git a/share/functions/fish_vi_key_bindings.fish b/share/functions/fish_vi_key_bindings.fish
index 4a7366ed8..0b002cf9b 100644
--- a/share/functions/fish_vi_key_bindings.fish
+++ b/share/functions/fish_vi_key_bindings.fish
@@ -55,7 +55,7 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
 
     bind -s --preset -M insert "" self-insert
     # Space expands abbrs _and_ inserts itself.
-    bind -s --preset -M insert " " 'commandline -i " "; commandline -f expand-abbr'
+    bind -s --preset -M insert " " self-insert expand-abbr
 
     # Add a way to switch from insert to normal (command) mode.
     # Note if we are paging, we want to stay in insert mode