diff --git a/config/packages/devices/living_room/toshiba_ac.yaml b/config/packages/devices/living_room/toshiba_ac.yaml
index 3f84104..17b990b 100644
--- a/config/packages/devices/living_room/toshiba_ac.yaml
+++ b/config/packages/devices/living_room/toshiba_ac.yaml
@@ -80,7 +80,7 @@ automation:
       - platform: state
         entity_id:
           - binary_sensor.living_room_right_window
-          - binary_sensor.bedroom_right_window
+          - group.bedroom_windows
         from: "on"
         to: "off"
     condition:
@@ -99,7 +99,7 @@ automation:
           entity_id: binary_sensor.living_room_right_window
           state: "off"
         - condition: state
-          entity_id: binary_sensor.bedroom_right_window
+          entity_id: group.bedroom_windows
           state: "off"
         - condition: state
           entity_id: climate.toshiba_ac
diff --git a/config/packages/modules/climate/windows.yaml b/config/packages/modules/climate/windows.yaml
index c9fcbbd..e4dcb80 100644
--- a/config/packages/modules/climate/windows.yaml
+++ b/config/packages/modules/climate/windows.yaml
@@ -7,6 +7,12 @@ group:
       - binary_sensor.bedroom_right_window
       - binary_sensor.kitchen_window
 
+  bedroom_windows:
+    name: Bedroom windows
+    entities:
+      - binary_sensor.bedroom_left_window
+      - binary_sensor.bedroom_right_window
+
 binary_sensor:
   - platform: mqtt
     name: "Living room right window"