diff --git a/hue-dimmer-v1-hue-integration-blueprint.yaml b/hue-dimmer-v1-hue-integration-blueprint.yaml
index 5125c06..631d86e 100644
--- a/hue-dimmer-v1-hue-integration-blueprint.yaml
+++ b/hue-dimmer-v1-hue-integration-blueprint.yaml
@@ -18,6 +18,11 @@ blueprint:
               default:
               selector:
                   action:
+          button1_double_press:
+              name: Button 1 double press
+              default:
+              selector:
+                  action:
           button1_long_press:
               name: Button 1 long press
               default:
@@ -107,13 +112,32 @@ triggers:
     trigger: event
     id: button4
 conditions: []
+variables:
+  timeoutms: 300
 actions:
   - choose:
       - conditions:
           - condition: template
             value_template: >-
               {{ trigger.id == "button1" and trigger.event.data.new_state.attributes.event_type == "short_release"}}
-        sequence: !input button1_short_press
+        sequence: 
+          - wait_for_trigger:
+              - event_type: state_changed
+                event_data:
+                  entity_id: "{{ var_button1 }}"
+                trigger: event
+                timeout:
+                  hours: 0
+                  minutes: 0
+                  seconds: 0
+                  milliseconds: "{{ timeoutms }}"
+                continue_on_timeout: true
+              - if:
+                  - condition: template
+                    value_template: >-
+                      {{ wait.trigger == none and wait.trigger.event.data.new_state.attributes.event_type == "short_release"}}
+                then: !input button1_short_press
+                else:
       - conditions:
           - condition: template
             value_template: >-