diff --git a/chch-power.py b/chch-power.py
index a90ae69..5915a17 100644
--- a/chch-power.py
+++ b/chch-power.py
@@ -86,13 +86,13 @@ def exec_chch_button_cmd(event):
             sys.stderr.write("No mode with " + str(count) +  " short press and a long press\n")
     else:
         # '.' room specific function
-        elif count == 1:
+        if count == 1:
             if event.pin_num == 0:
                 call(["/home/automation/chch-power/light.sh"])
             else:
                 sys.stderr.write("No room specific function for room " + str(event.pin_num) + "\n")
         # '. .' toggle current room
-        if count == 2:
+        elif count == 2:
             event.chip.output_pins[event.pin_num].toggle()
         else:
             sys.stderr.write("No mode with " + str(count) + " short press at pin " + str(event.pin_num) + "\n")