diff --git a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
index cadb1455..735a0f7d 100644
--- a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
+++ b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
@@ -218,6 +218,8 @@ class NsPanelLovelaceUI:
     if(btype == "button"):
       if(entity_id.startswith('scene')):
         self.api.get_entity(entity_id).call_service("turn_on")
+      if(entity_id.startswith('light') or entity_id.startswith('switch')):
+        self.api.get_entity(entity_id).call_service("toggle")
       else:
         self.api.get_entity(entity_id).call_service("press")