diff --git a/lyrathorpe/home/shell.nix b/lyrathorpe/home/shell.nix
index 2eb0679..0403dc9 100644
--- a/lyrathorpe/home/shell.nix
+++ b/lyrathorpe/home/shell.nix
@@ -6,7 +6,21 @@
     enableCompletion = true;
     enableVteIntegration = true;
     autosuggestion.enable = true;
-    historySubstringSearch.enable = true;
+    # Bind Up/Down for history-substring-search in BOTH cursor-key modes: CSI
+    # (^[[A/^[[B -- normal mode, and what the Linux TTY sends) and SS3
+    # (^[OA/^[OB -- application mode, used by foot, tmux and iTerm2). Binding
+    # only the default CSI form leaves it dead at the prompt in foot/iTerm2.
+    historySubstringSearch = {
+      enable = true;
+      searchUpKey = [
+        "^[[A"
+        "^[OA"
+      ];
+      searchDownKey = [
+        "^[[B"
+        "^[OB"
+      ];
+    };
     history.append = true;
     oh-my-zsh = {
       enable = true;