diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index 622e36fb..74a3070a 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -2153,6 +2153,16 @@ map ctrl+alt+up kitten pass_keys.py relative_resize up    3 ctrl+alt+up
 map ctrl+alt+left kitten pass_keys.py relative_resize left  3 ctrl+alt+left
 map ctrl+alt+right kitten pass_keys.py relative_resize right 3 ctrl+alt+right
 
+# kitty-scrollback.nvim Kitten alias
+action_alias kitty_scrollback_nvim kitten /home/matt/.local/share/nvim/lazy/kitty-scrollback.nvim/python/kitty_scrollback_nvim.py
+ 
+# Browse scrollback buffer in nvim
+map kitty_mod+h kitty_scrollback_nvim
+# Browse output of the last shell command in nvim
+map kitty_mod+g kitty_scrollback_nvim --config ksb_builtin_last_cmd_output
+# Show clicked command output in nvim
+mouse_map ctrl+shift+right press ungrabbed combine : mouse_select_command_output : kitty_scrollback_nvim --config ksb_builtin_last_visited_cmd_output
+
 #: }}}
 
 #: }}}
diff --git a/.config/nvim/.github/README.md b/.config/nvim/.github/README.md
index 723f6eb3..c7f42b38 100644
--- a/.config/nvim/.github/README.md
+++ b/.config/nvim/.github/README.md
@@ -453,6 +453,13 @@
 
 </details>
 
+<details>
+<summary><b>💻 Terminal Integration</b></summary>
+
+- [mikesmithgh/kitty-scrollback.nvim](https://dotfyle.com/plugins/mikesmithgh/kitty-scrollback.nvim)
+
+</details>
+
 <details>
 <summary><b>🧪 Test</b></summary>
 
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index f3356d28..bb82abf5 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -39,6 +39,7 @@
   "icon-picker.nvim": { "branch": "master", "commit": "172717e16ef9fe8bf289a75eca8372962726c8c8" },
   "inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" },
   "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" },
+  "kitty-scrollback.nvim": { "branch": "main", "commit": "7f33ae83bbcccc15022a9b9b5802b5796b73fea7" },
   "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
   "live-server.nvim": { "branch": "main", "commit": "f6f00a3f541251f0320910bb0d03c4ae14ee6d10" },
   "lsp-lens.nvim": { "branch": "main", "commit": "48bb1a7e271424c15f3d588d54adc9b7c319d977" },
diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json
index a757c247..afbfebac 100644
--- a/.config/nvim/lazyvim.json
+++ b/.config/nvim/lazyvim.json
@@ -80,6 +80,7 @@
     "plugins.extras.util.bigfile",
     "plugins.extras.util.discordrcp",
     "plugins.extras.util.icon-picker",
+    "plugins.extras.util.kitty-scrollback",
     "plugins.extras.util.vscode",
     "plugins.extras.util.wakatime"
   ],
diff --git a/.config/nvim/lua/plugins/extras/util/kitty-scrollback.lua b/.config/nvim/lua/plugins/extras/util/kitty-scrollback.lua
new file mode 100644
index 00000000..0e4c70c3
--- /dev/null
+++ b/.config/nvim/lua/plugins/extras/util/kitty-scrollback.lua
@@ -0,0 +1,7 @@
+return {
+  "mikesmithgh/kitty-scrollback.nvim",
+  lazy = true,
+  cmd = { "KittyScrollbackGenerateKittens", "KittyScrollbackCheckHealth" },
+  event = { "User KittyScrollbackLaunch" },
+  opts = {},
+}