diff --git a/platforms/home-manager/modules/nmasur/presets/programs/fish.nix b/platforms/home-manager/modules/nmasur/presets/programs/fish.nix
index c5aa4b23..7e73517c 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/fish.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/fish.nix
@@ -69,6 +69,9 @@ in
         set -g fish_cursor_insert line
         set -g fish_cursor_visual block
         set -g fish_cursor_replace_one underscore
+
+        # Fix for lagging after exiting TUIs with Zellij and Ghostty
+        set -a fish_features no-query-term
       '';
       loginShellInit = "";
       shellAbbrs = {