diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index 8045e8f..6f1a825 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -6719,7 +6719,7 @@ action:
                           else { "page": "unknown", "component": "unknown", "value": "unknown" }
                         }}
                       last_click_button: '{{ button_pages_buttons | selectattr("page", "defined") | selectattr("page", "eq", nspanel_event.page) | selectattr("component", "defined") | selectattr("component", "eq", nspanel_event.component) | list }}'
-                  - condition: '{{ last_click_button | count >= 0 }}'
+                  - condition: '{{ last_click_button | count >= 0 and button_wait.page == nspanel_event.page }}'
                   - if: '{{ not wait.completed }}'
                     then: # Long press
                       - service: '{{ nextion.commands.set_settings_entity }}'