diff --git a/src/renderer/pages/home.tsx b/src/renderer/pages/home.tsx
index abf8550..ab172ab 100644
--- a/src/renderer/pages/home.tsx
+++ b/src/renderer/pages/home.tsx
@@ -19,8 +19,10 @@ const Home = () => {
 
   useEffect(() => {
     if (!user) return;
-    if (!isCompletedOnboarding) return navigate(PATH.ONBOARDING);
-    if (!user.cat) return navigate(PATH.SELECTION);
+    if (!user.cat) {
+      if (!isCompletedOnboarding) return navigate(PATH.ONBOARDING);
+      return navigate(PATH.SELECTION);
+    }
     navigate(PATH.POMODORO);
   }, [isCompletedOnboarding, user]);
 
diff --git a/src/renderer/widgets/pomodoro/ui/rest-screen.tsx b/src/renderer/widgets/pomodoro/ui/rest-screen.tsx
index 6c35f83..f23eebe 100644
--- a/src/renderer/widgets/pomodoro/ui/rest-screen.tsx
+++ b/src/renderer/widgets/pomodoro/ui/rest-screen.tsx
@@ -85,7 +85,7 @@ export const RestScreen = ({
           >
             <SelectGroupItem
               disabled={currentRestMinutes - MINUTES_GAP <= MIN_REST_MINUTES}
-              value="minus-focus-time"
+              value="minus"
               className="flex flex-row items-center justify-center gap-1 px-3 py-2"
             >
               <Icon name="minusSvg" size="sm" className="[&>path]:stroke-icon-tertiary" />
@@ -93,7 +93,7 @@ export const RestScreen = ({
             </SelectGroupItem>
             <SelectGroupItem
               disabled={currentRestMinutes + MINUTES_GAP >= MAX_REST_MINUTES}
-              value="plus-focus-time"
+              value="plus"
               className="flex flex-row items-center justify-center gap-1 px-3 py-2"
             >
               <Icon name="plusSvg" size="sm" className="[&>path]:stroke-icon-tertiary" />
diff --git a/src/renderer/widgets/pomodoro/ui/rest-wait-screen.tsx b/src/renderer/widgets/pomodoro/ui/rest-wait-screen.tsx
index 7437dba..f5ad2f7 100644
--- a/src/renderer/widgets/pomodoro/ui/rest-wait-screen.tsx
+++ b/src/renderer/widgets/pomodoro/ui/rest-wait-screen.tsx
@@ -88,7 +88,7 @@ export const RestWaitScreen = ({
           >
             <SelectGroupItem
               disabled={currentFocusMinutes - MINUTES_GAP <= MIN_FOCUS_MINUTES}
-              value="minus-focus-time"
+              value="minus"
               className="flex flex-row items-center justify-center gap-1 px-3 py-2"
             >
               <Icon name="minusSvg" size="sm" className="[&>path]:stroke-icon-tertiary" />
@@ -96,7 +96,7 @@ export const RestWaitScreen = ({
             </SelectGroupItem>
             <SelectGroupItem
               disabled={currentFocusMinutes + MINUTES_GAP >= MAX_FOCUS_MINUTES}
-              value="plus-focus-time"
+              value="plus"
               className="flex flex-row items-center justify-center gap-1 px-3 py-2"
             >
               <Icon name="plusSvg" size="sm" className="[&>path]:stroke-icon-tertiary" />