diff --git a/internal/tmux/tmux.go b/internal/tmux/tmux.go
index 435e6126..aee4533f 100644
--- a/internal/tmux/tmux.go
+++ b/internal/tmux/tmux.go
@@ -63,7 +63,8 @@ func (t *Tmux) wrapError(err error, stderr string, args []string) error {
 
 	// Detect specific error types
 	if strings.Contains(stderr, "no server running") ||
-		strings.Contains(stderr, "error connecting to") {
+		strings.Contains(stderr, "error connecting to") ||
+		strings.Contains(stderr, "no current target") {
 		return ErrNoServer
 	}
 	if strings.Contains(stderr, "duplicate session") {
diff --git a/internal/tmux/tmux_test.go b/internal/tmux/tmux_test.go
index a1f71f00..615b7b42 100644
--- a/internal/tmux/tmux_test.go
+++ b/internal/tmux/tmux_test.go
@@ -198,6 +198,7 @@ func TestWrapError(t *testing.T) {
 	}{
 		{"no server running on /tmp/tmux-...", ErrNoServer},
 		{"error connecting to /tmp/tmux-...", ErrNoServer},
+		{"no current target", ErrNoServer},
 		{"duplicate session: test", ErrSessionExists},
 		{"session not found: test", ErrSessionNotFound},
 		{"can't find session: test", ErrSessionNotFound},