diff --git a/src/components/menu/items/timer.tsx b/src/components/menu/items/countdown-timer.tsx
similarity index 82%
rename from src/components/menu/items/timer.tsx
rename to src/components/menu/items/countdown-timer.tsx
index 371330c..3889843 100644
--- a/src/components/menu/items/timer.tsx
+++ b/src/components/menu/items/countdown-timer.tsx
@@ -6,7 +6,7 @@ interface SleepTimerProps {
   open: () => void;
 }
 
-export function Timer({ open }: SleepTimerProps) {
+export function CountdownTimer({ open }: SleepTimerProps) {
   return (
     <Item
       icon={<MdOutlineTimer />}
diff --git a/src/components/menu/items/index.ts b/src/components/menu/items/index.ts
index 9a42e95..e5c2904 100644
--- a/src/components/menu/items/index.ts
+++ b/src/components/menu/items/index.ts
@@ -7,4 +7,4 @@ export { Pomodoro as PomodoroItem } from './pomodoro';
 export { Presets as PresetsItem } from './presets';
 export { Shortcuts as ShortcutsItem } from './shortcuts';
 export { SleepTimer as SleepTimerItem } from './sleep-timer';
-export { Timer as TimerItem } from './timer';
+export { CountdownTimer as CountdownTimerItem } from './countdown-timer';
diff --git a/src/components/menu/menu.tsx b/src/components/menu/menu.tsx
index ace84cf..a4bd57c 100644
--- a/src/components/menu/menu.tsx
+++ b/src/components/menu/menu.tsx
@@ -11,7 +11,7 @@ import {
   NotepadItem,
   SourceItem,
   PomodoroItem,
-  TimerItem,
+  CountdownTimerItem,
   PresetsItem,
   ShortcutsItem,
   SleepTimerItem,
@@ -21,7 +21,7 @@ import { ShareLinkModal } from '@/components/modals/share-link';
 import { PresetsModal } from '@/components/modals/presets';
 import { ShortcutsModal } from '@/components/modals/shortcuts';
 import { SleepTimerModal } from '@/components/modals/sleep-timer';
-import { Notepad, Pomodoro, Timer } from '@/components/toolbox';
+import { Notepad, Pomodoro, CountdownTimer } from '@/components/toolbox';
 import { fade, mix, slideY } from '@/lib/motion';
 import { useSoundStore } from '@/stores/sound';
 
@@ -36,13 +36,13 @@ export function Menu() {
 
   const initial = useMemo(
     () => ({
+      countdownTimer: false,
       notepad: false,
       pomodoro: false,
       presets: false,
       shareLink: false,
       shortcuts: false,
       sleepTimer: false,
-      timer: false,
     }),
     [],
   );
@@ -68,11 +68,11 @@ export function Menu() {
   useHotkeys('shift+m', () => setIsOpen(prev => !prev));
   useHotkeys('shift+n', () => open('notepad'));
   useHotkeys('shift+p', () => open('pomodoro'));
-  useHotkeys('shift+t', () => open('timer'));
+  useHotkeys('shift+c', () => open('countdownTimer'));
   useHotkeys('shift+alt+p', () => open('presets'));
   useHotkeys('shift+h', () => open('shortcuts'));
   useHotkeys('shift+s', () => open('shareLink'), { enabled: !noSelected });
-  useHotkeys('shift+alt+t', () => open('sleepTimer'));
+  useHotkeys('shift+t', () => open('sleepTimer'));
 
   useCloseListener(closeAll);
 
@@ -113,7 +113,7 @@ export function Menu() {
                     <Divider />
                     <NotepadItem open={() => open('notepad')} />
                     <PomodoroItem open={() => open('pomodoro')} />
-                    <TimerItem open={() => open('timer')} />
+                    <CountdownTimerItem open={() => open('countdownTimer')} />
 
                     <Divider />
                     <ShortcutsItem open={() => open('shortcuts')} />
@@ -144,7 +144,10 @@ export function Menu() {
         show={modals.pomodoro}
         onClose={() => close('pomodoro')}
       />
-      <Timer show={modals.timer} onClose={() => close('timer')} />
+      <CountdownTimer
+        show={modals.countdownTimer}
+        onClose={() => close('countdownTimer')}
+      />
       <SleepTimerModal
         show={modals.sleepTimer}
         onClose={() => close('sleepTimer')}
diff --git a/src/components/modals/shortcuts/shortcuts.tsx b/src/components/modals/shortcuts/shortcuts.tsx
index 3b705fd..678d37a 100644
--- a/src/components/modals/shortcuts/shortcuts.tsx
+++ b/src/components/modals/shortcuts/shortcuts.tsx
@@ -30,11 +30,11 @@ export function ShortcutsModal({ onClose, show }: ShortcutsModalProps) {
       label: 'Pomodoro Timer',
     },
     {
-      keys: ['Shift', 'T'],
+      keys: ['Shift', 'C'],
       label: 'Countdown Timer',
     },
     {
-      keys: ['Shift', 'Alt', 'T'],
+      keys: ['Shift', 'T'],
       label: 'Sleep Timer',
     },
     {
diff --git a/src/components/toolbox/timer/timer.module.css b/src/components/toolbox/countdown-timer/countdown-timer.module.css
similarity index 100%
rename from src/components/toolbox/timer/timer.module.css
rename to src/components/toolbox/countdown-timer/countdown-timer.module.css
diff --git a/src/components/toolbox/timer/timer.tsx b/src/components/toolbox/countdown-timer/countdown-timer.tsx
similarity index 76%
rename from src/components/toolbox/timer/timer.tsx
rename to src/components/toolbox/countdown-timer/countdown-timer.tsx
index f4fac85..613ca15 100644
--- a/src/components/toolbox/timer/timer.tsx
+++ b/src/components/toolbox/countdown-timer/countdown-timer.tsx
@@ -5,7 +5,7 @@ interface TimerProps {
   show: boolean;
 }
 
-export function Timer({ onClose, show }: TimerProps) {
+export function CountdownTimer({ onClose, show }: TimerProps) {
   return (
     <Modal show={show} onClose={onClose}>
       <h1>Hello World</h1>
diff --git a/src/components/toolbox/countdown-timer/index.ts b/src/components/toolbox/countdown-timer/index.ts
new file mode 100644
index 0000000..104cbaf
--- /dev/null
+++ b/src/components/toolbox/countdown-timer/index.ts
@@ -0,0 +1 @@
+export { CountdownTimer } from './countdown-timer';
diff --git a/src/components/toolbox/index.ts b/src/components/toolbox/index.ts
index 07e92e8..67924b9 100644
--- a/src/components/toolbox/index.ts
+++ b/src/components/toolbox/index.ts
@@ -1,3 +1,3 @@
 export { Notepad } from './notepad';
 export { Pomodoro } from './pomodoro';
-export { Timer } from './timer';
+export { CountdownTimer } from './countdown-timer';
diff --git a/src/components/toolbox/timer/index.ts b/src/components/toolbox/timer/index.ts
deleted file mode 100644
index 91b3f08..0000000
--- a/src/components/toolbox/timer/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { Timer } from './timer';