diff --git a/homeassistant/components/demo.py b/homeassistant/components/demo.py
index 348ba0f645b..caf441248d7 100644
--- a/homeassistant/components/demo.py
+++ b/homeassistant/components/demo.py
@@ -62,10 +62,17 @@ def setup(hass, config):
     lights = sorted(hass.states.entity_ids('light'))
     switches = sorted(hass.states.entity_ids('switch'))
     media_players = sorted(hass.states.entity_ids('media_player'))
-    group.Group(hass, 'living room', [lights[2], lights[1], switches[0],
-                                      media_players[1]])
+    group.Group(hass, 'living room', [
+        lights[2], lights[1], switches[0], media_players[1],
+        'scene.romantic_lights'])
     group.Group(hass, 'bedroom', [lights[0], switches[1],
                                   media_players[0]])
+    group.Group(hass, 'Rooms', [
+        'group.living_room', 'group.bedroom',
+        'scene.romantic_lights', 'rollershutter.kitchen_window',
+        'rollershutter.living_room_window',
+    ], view=True)
+
 
     # Setup scripts
     bootstrap.setup_component(