diff --git a/modules/common/applications/kitty.nix b/modules/common/applications/kitty.nix
index 4eb9d1f..c41cbb2 100644
--- a/modules/common/applications/kitty.nix
+++ b/modules/common/applications/kitty.nix
@@ -60,7 +60,7 @@
           # Required for kitty-scrollback.nvim
           allow_remote_control = "socket-only";
           listen_on = "unix:/tmp/kitty";
-          action_alias = "kitty_scrollback_nvim kitten ${pkgs.vimPlugins.kitty-scrollback-nvim}/python/kitty_scrollback_nvim.py";
+          action_alias = "kitty_scrollback_nvim kitten ${pkgs.vimPlugins.kitty-scrollback-nvim}/python/kitty_scrollback_nvim.py --no-nvim-args";
 
           # Colors (adapted from: https://github.com/kdrag0n/base16-kitty/blob/master/templates/default-256.mustache)
           background = config.theme.colors.base00;
diff --git a/modules/common/neovim/config/misc.nix b/modules/common/neovim/config/misc.nix
index 3c4abdc..aa3f153 100644
--- a/modules/common/neovim/config/misc.nix
+++ b/modules/common/neovim/config/misc.nix
@@ -24,7 +24,14 @@
   };
   setup.glow = { };
   setup.which-key = { };
-  setup.kitty-scrollback = { };
+  setup.kitty-scrollback = {
+    global = dsl.rawLua ''
+        {
+            keymaps_enabled = false,
+            vim.keymap.set({ 'v' }, 'y', '<Plug>(KsbVisualYank)<CR><Plug>(KsbQuitAll)', {})
+        }
+    '';
+  };
 
   vim.o = {
     termguicolors = true; # Set to truecolor