diff --git a/js/misc/breakManager.js b/js/misc/breakManager.js
index 4374af2d5..06c88e06a 100644
--- a/js/misc/breakManager.js
+++ b/js/misc/breakManager.js
@@ -180,10 +180,15 @@ export const BreakManager = GObject.registerClass({
             }
         }
 
+        this.freeze_notify();
         this.notify('next-break-due-time');
 
         if (this._state === BreakState.DISABLED)
             this._startStateMachine();
+        else
+            this._updateState(currentTime);
+
+        this.thaw_notify();
 
         return true;
     }