diff --git a/.config/quickshell/ii/modules/sidebarRight/pomodoro/Stopwatch.qml b/.config/quickshell/ii/modules/sidebarRight/pomodoro/Stopwatch.qml
index 2f148393..ffc70656 100644
--- a/.config/quickshell/ii/modules/sidebarRight/pomodoro/Stopwatch.qml
+++ b/.config/quickshell/ii/modules/sidebarRight/pomodoro/Stopwatch.qml
@@ -191,7 +191,7 @@ Item {
                     else 
                         TimerService.stopwatchReset()
                 }
-                enabled: TimerService.stopwatchTime !== 0
+                enabled: TimerService.stopwatchTime > 0 || Persistent.states.timer.stopwatch.laps.length > 0
 
                 colBackground: TimerService.stopwatchRunning ? Appearance.colors.colLayer2 : Appearance.colors.colErrorContainer
                 colBackgroundHover: TimerService.stopwatchRunning ? Appearance.colors.colLayer2Hover : Appearance.colors.colErrorContainerHover
diff --git a/.config/quickshell/ii/services/TimerService.qml b/.config/quickshell/ii/services/TimerService.qml
index 5824c01a..e6c8906b 100644
--- a/.config/quickshell/ii/services/TimerService.qml
+++ b/.config/quickshell/ii/services/TimerService.qml
@@ -125,6 +125,7 @@ Singleton {
     }
 
     function stopwatchResume() {
+        if (stopwatchTime === 0) Persistent.states.timer.stopwatch.laps = [];
         Persistent.states.timer.stopwatch.running = true;
         Persistent.states.timer.stopwatch.start = getCurrentTimeIn10ms() - stopwatchTime;
     }