diff --git a/mac/Sources/Byre/Phone.swift b/mac/Sources/Byre/Phone.swift
index 0e74d86..9fd0b47 100644
--- a/mac/Sources/Byre/Phone.swift
+++ b/mac/Sources/Byre/Phone.swift
@@ -176,6 +176,10 @@ struct PhoneView: View {
             .buttonStyle(.plain)
             .accessibilityLabel("New task")
             Button {
+                if tab == .tasks && path.isEmpty && store.selectedTaskId != nil {
+                    path = [.task]
+                    return
+                }
                 tab = .tasks
                 path = []
             } label: {