diff --git a/modules/cli/tools/jujutsu.nix b/modules/cli/tools/jujutsu.nix
index bda5707..39515cf 100644
--- a/modules/cli/tools/jujutsu.nix
+++ b/modules/cli/tools/jujutsu.nix
@@ -1,4 +1,4 @@
-{
+{pkgs, ...}: {
   programs.jujutsu = {
     enable = true;
     settings = {
@@ -49,6 +49,18 @@
 
   programs.jjui = {
     enable = true;
+    # while waiting for https://github.com/charmbracelet/bubbles/pull/1020
+    package = pkgs.jjui.overrideAttrs (old: {
+      postPatch =
+        (old.postPatch or "")
+        + ''
+          substituteInPlace internal/ui/operations/describe/describe.go \
+            --replace-fail 'input := textarea.New()' 'input := textarea.New()
+          	input.KeyMap.WordForward.SetKeys("alt+right", "alt+f", "ctrl+right")
+          	input.KeyMap.WordBackward.SetKeys("alt+left", "alt+b", "ctrl+left")
+          	input.KeyMap.DeleteWordBackward.SetKeys("alt+backspace", "ctrl+w", "ctrl+backspace")'
+        '';
+    });
     settings = {
       actions = [
         {
diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua
index c514eb1..25269bb 100644
--- a/nvim/lua/settings.lua
+++ b/nvim/lua/settings.lua
@@ -63,8 +63,9 @@ vim.g.did_install_default_menus = 1
 
 -- for all modes except terminal
 vim.keymap.set({ "i", "n", "o", "x", "v", "s", "l", "c" }, "<C-c>", "<esc>")
+-- <esc> leaves terminal mode, <C-q> sends a real <esc> to the terminal app
 vim.keymap.set("t", "<esc>", "<C-\\><C-N>", { desc = "Normal mode" })
-vim.keymap.set("t", "<S-Esc>", "<esc>", { desc = "Send escape to terminal" })
+vim.keymap.set("t", "<C-q>", "<esc>", { desc = "Send escape to terminal" })
 -- Why is this not the default?
 vim.keymap.set("c", "<c-a>", "<home>", { desc = "Begining" })