diff --git a/tmux.conf b/tmux.conf
index d71052f..978dc20 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -62,7 +62,9 @@ if '[ ! -n $ITERM_PROFILE ]' \
 set -ga terminal-overrides 'xterm*:smxx=\E[9m'
 
 if -b '~/.config/tmux/check-version.sh ">=" 3.2 && ~/.config/tmux/check-version.sh "<" 3.3' {
-  bind A display-popup -d '#{pane_current_path}' -w 50% -h 90% -E ~/.config/tmux/agent.sh
+  bind A if -F '#{==:#{session_name},agent}' { detach-client } {
+    display-popup -d '#{pane_current_path}' -w 50% -h 90% -E ~/.config/tmux/agent.sh
+  }
   bind H display-popup -w 75% -h 75% -E htop
   bind I display-popup -d '#{pane_current_path}' -E ~/.config/tmux/interpreter.sh
   bind N display-popup -w 75% -h 90% -E ~/.config/tmux/notes.sh
@@ -71,7 +73,9 @@ if -b '~/.config/tmux/check-version.sh ">=" 3.2 && ~/.config/tmux/check-version.
   bind T display-popup -d '#{pane_current_path}' -E $SHELL
 }
 if -b '~/.config/tmux/check-version.sh ">=" 3.3' {
-  bind A display-popup -S fg=#54546D -b rounded -d '#{pane_current_path}' -w 75% -h 90% -E ~/.config/tmux/agent.sh
+  bind A if -F '#{==:#{session_name},agent}' { detach-client } {
+    display-popup -S fg=#54546D -b rounded -d '#{pane_current_path}' -w 75% -h 90% -E ~/.config/tmux/agent.sh
+  }
   bind H display-popup -S fg=#54546D -b rounded -w 50% -h 75% -E htop
   bind I display-popup -S fg=#54546D -b rounded -d '#{pane_current_path}' -E ~/.config/tmux/interpreter.sh
   bind N display-popup -S fg=#54546D -b rounded -w 75% -h 90% -E ~/.config/tmux/notes.sh