diff --git a/nspanel_esphome_core.yaml b/nspanel_esphome_core.yaml
index 9f89019..0af6c9c 100644
--- a/nspanel_esphome_core.yaml
+++ b/nspanel_esphome_core.yaml
@@ -1548,12 +1548,22 @@ script:
       - if:
           condition:
             - lambda: |-
-                return (page != "screensaver" and page != "boot" and page != "home" and timeout >= 1);
+                return (timeout >= 1 and
+                        page != "boot" and
+                        page != "confirm" and
+                        page != "home" and
+                        page != "notification" and
+                        page != "screensaver");
           then:
             - delay: !lambda return (timeout *1000);
             - lambda: |-
                 ESP_LOGV("script.timer_page", "Timed out on page: %s", current_page->state.c_str());
-                if (current_page->state != "screensaver" and current_page->state != "boot" and current_page->state != "home" and timeout >= 1)
+                if (timeout >= 1 and
+                    current_page->state != "boot" and
+                    current_page->state != "confirm" and
+                    current_page->state != "home" and
+                    current_page->state != "notification" and
+                    current_page->state != "screensaver")
                   {
                     ESP_LOGD("script.timer_page", "Fallback to page Home");
                     disp1->goto_page("home");