diff --git a/garage.yaml b/garage.yaml
index 3039ecf..0f8537c 100644
--- a/garage.yaml
+++ b/garage.yaml
@@ -67,6 +67,8 @@ binary_sensor:
     on_press:
       then:
         - lambda: |-
+            id(garage_door).current_operation = COVER_OPERATION_IDLE;
+            id(garage_door).position = COVER_OPEN;
             id(garage_door_state).publish_state("Open");
     on_release:
       then:
@@ -83,6 +85,8 @@ binary_sensor:
     on_press:
       then:
         - lambda: |-
+            id(garage_door).current_operation = COVER_OPERATION_IDLE;
+            id(garage_door).position = COVER_CLOSED;
             id(garage_door_state).publish_state("Closed");
     on_release:
       then: