diff --git a/aspects/base/zsh.nix b/aspects/base/zsh.nix
index c0313c9..151801d 100644
--- a/aspects/base/zsh.nix
+++ b/aspects/base/zsh.nix
@@ -30,6 +30,10 @@
             unsetopt beep
             ${lib.getExe pkgs.nix-your-shell} zsh | source /dev/stdin
 
+            # Expand !! and !$ on space (Fish-style)
+            bindkey ' ' magic-space
+            setopt HIST_VERIFY
+
             # Fish-style Ctrl+Backspace: delete one path segment at a time
             function backward-kill-path-component() {
               if [[ "$LBUFFER" == */ ]]; then