diff --git a/static/js/domoboard.js b/static/js/domoboard.js
index 0341b7b..51fdd52 100644
--- a/static/js/domoboard.js
+++ b/static/js/domoboard.js
@@ -22,6 +22,16 @@ function changeSwitch(checkboxElem, idx) {
   }
 }
 
+// Switch functions
+function changePush(idx, action) {
+  if (action == 'on') {
+    requestAPI(flask_server + "/api?type=command&param=switchlight&idx=" + idx + "&switchcmd=On" );
+  } else {
+    requestAPI(flask_server + "/api?type=command&param=switchlight&idx=" + idx + "&switchcmd=Off"  );
+  }
+}
+
+
 function refreshSwitches(updateSwitches, block) {
   $.each(updateSwitches, function (i, switchID) {
     var url = flask_server + "/api?type=devices&rid=" + switchID;
diff --git a/templates/switches.html b/templates/switches.html
index a4ebeae..635f67d 100644
--- a/templates/switches.html
+++ b/templates/switches.html
@@ -95,10 +95,16 @@ $(document).ready(function() {
     			changeSwitch(this, {{v[0]}});
   		});
   		updateSwitches_block_{{count}}.push("{{v[0]}}");
-    {% elif (v[1] == "pushon") or (v[1] == "pushoff") %}
-      $('button[id="push_{{v[0]}}_block_{{count}}"]').click(function() {
-        changeSwitch(this, {{v[0]}});
-      });
+    {% elif (v[1] == "pushon") %}
+    $('button[id="push_{{v[0]}}_block_{{count}}"]').click(function(e) {
+      e.preventDefault();
+      changePush({{v[0]}}, 'on');
+    });
+    {% elif (v[1] == "pushoff") %}
+    $('button[id="push_{{v[0]}}_block_{{count}}"]').click(function(e) {
+      e.preventDefault();
+      changePush({{v[0]}}, 'off');
+    });
     {% elif (v[1] == "setpoint") %}
   		updateSetpoints_block_{{count}}.push("{{v[0]}}");
   	{% elif (v[1] == "dimmer" or v[1] == "rgb") %}