diff --git a/src/components/menu/menu.tsx b/src/components/menu/menu.tsx
index 2a16c4b..de1ac89 100644
--- a/src/components/menu/menu.tsx
+++ b/src/components/menu/menu.tsx
@@ -26,6 +26,7 @@ import { useSoundStore } from '@/store';
 
 import styles from './menu.module.css';
 import { useCloseListener } from '@/hooks/use-close-listener';
+import { closeModals } from '@/lib/modal';
 
 export function Menu() {
   const [isOpen, setIsOpen] = useState(false);
@@ -56,6 +57,7 @@ export function Menu() {
     (name: string) => {
       closeAll();
       setIsOpen(false);
+      closeModals();
       setModals(prev => ({ ...prev, [name]: true }));
     },
     [closeAll],
diff --git a/src/components/toolbox/pomodoro/pomodoro.tsx b/src/components/toolbox/pomodoro/pomodoro.tsx
index ac5b489..b9b5fc3 100644
--- a/src/components/toolbox/pomodoro/pomodoro.tsx
+++ b/src/components/toolbox/pomodoro/pomodoro.tsx
@@ -11,6 +11,7 @@ import { Setting } from './setting';
 import { useLocalStorage } from '@/hooks/use-local-storage';
 import { useSoundEffect } from '@/hooks/use-sound-effect';
 import { usePomodoroStore } from '@/store';
+import { useCloseListener } from '@/hooks/use-close-listener';
 
 import styles from './pomodoro.module.css';
 
@@ -62,6 +63,8 @@ export function Pomodoro({ onClose, open, show }: PomodoroProps) {
     [],
   );
 
+  useCloseListener(() => setShowSetting(false));
+
   useEffect(() => {
     if (running) {
       if (interval.current) clearInterval(interval.current);