diff --git a/lib/screens/timer/screen_timer.dart b/lib/screens/timer/screen_timer.dart
index ab72679..285d8f4 100644
--- a/lib/screens/timer/screen_timer.dart
+++ b/lib/screens/timer/screen_timer.dart
@@ -44,7 +44,9 @@ class TimerScreenState extends State<TimerScreen> with TickerProviderStateMixin
     timelineController = AnimationController(vsync: this, duration: widget.duration);
     timelineAnimation = Tween<double>(begin: 1, end: 0).animate(timelineController);
     timelineController.addStatusListener((status) {
-      if (status == AnimationStatus.completed) {
+      if (timelineController.value == 1) {
+        Navigator.of(context).pop();
+      } else if (status == AnimationStatus.completed) {
         context.read<TimerBloc>().add(const TimerEndedEvent());
       }
     });