From 236b4b704afc96a486b6ea1e2911384275cb0f75 Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannes.millan@gmail.com>
Date: Wed, 20 May 2026 16:01:49 +0200
Subject: [PATCH] fix(focus-mode): never show mode selector during a running
 session

Mode switching mid-session was intentionally allowed for Flowtime,
but users reported the selector popping up unexpectedly as confusing.
Restrict isShowModeSelector to the Preparation state only.
---
 .../focus-mode-main/focus-mode-main.component.spec.ts       | 4 ++--
 .../focus-mode/focus-mode-main/focus-mode-main.component.ts | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/app/features/focus-mode/focus-mode-main/focus-mode-main.component.spec.ts b/src/app/features/focus-mode/focus-mode-main/focus-mode-main.component.spec.ts
index 414ad1e38f..aab154c236 100644
--- a/src/app/features/focus-mode/focus-mode-main/focus-mode-main.component.spec.ts
+++ b/src/app/features/focus-mode/focus-mode-main/focus-mode-main.component.spec.ts
@@ -697,8 +697,8 @@ describe('FocusModeMainComponent - notes panel (issue #5752)', () => {
     (mockStore.dispatch as jasmine.Spy).calls.reset();
   });
 
-  it('should show the mode selector while a focus session is in progress', () => {
-    expect(component.isShowModeSelector()).toBe(true);
+  it('should hide the mode selector while a focus session is in progress', () => {
+    expect(component.isShowModeSelector()).toBe(false);
   });
 
   it('should hide the mode selector while a Flowtime session is in progress', () => {
diff --git a/src/app/features/focus-mode/focus-mode-main/focus-mode-main.component.ts b/src/app/features/focus-mode/focus-mode-main/focus-mode-main.component.ts
index bece65eb75..ca08886873 100644
--- a/src/app/features/focus-mode/focus-mode-main/focus-mode-main.component.ts
+++ b/src/app/features/focus-mode/focus-mode-main/focus-mode-main.component.ts
@@ -168,11 +168,7 @@ export class FocusModeMainComponent {
   displayDuration = signal(25 * 60 * 1000); // Default 25 minutes
   isTaskSelectorOpen = signal(false);
 
-  isShowModeSelector = computed(
-    () =>
-      this._isPreparation() ||
-      (this._isInProgress() && this.mode() !== FocusModeMode.Flowtime),
-  );
+  isShowModeSelector = computed(() => this._isPreparation());
   isShowPomodoroSettings = computed(
     () => this._isPreparation() && this.mode() === FocusModeMode.Pomodoro,
   );