diff --git a/shell/completion.zsh b/shell/completion.zsh
index d5ef40bc99c..c01bbb825f8 100644
--- a/shell/completion.zsh
+++ b/shell/completion.zsh
@@ -70,7 +70,7 @@ fi
 # control. There are several others that could wreck havoc if they are set
 # to values we don't expect. With the following `emulate` command we
 # sidestep this issue entirely.
-'emulate' 'zsh' '-o' 'no_aliases'
+'builtin' 'emulate' 'zsh' && 'builtin' 'setopt' 'no_aliases'
 
 # This brace is the start of try-always block. The `always` part is like
 # `finally` in lesser languages. We use it to *always* restore user options.
diff --git a/shell/key-bindings.zsh b/shell/key-bindings.zsh
index 4c4f0a0864a..b64f7916fc7 100644
--- a/shell/key-bindings.zsh
+++ b/shell/key-bindings.zsh
@@ -35,7 +35,7 @@ else
   }
 fi
 
-'emulate' 'zsh' '-o' 'no_aliases'
+'builtin' 'emulate' 'zsh' && 'builtin' 'setopt' 'no_aliases'
 
 {