diff --git a/index.html b/index.html
index fb5eb76..8e42783 100644
--- a/index.html
+++ b/index.html
@@ -590,14 +590,14 @@
           </div>
           <div class="h-box justify-space-start">
             <div id="S-OFF-ON" class="button m-8 flex-grow-1">OFF/ON</div>
-            <div id="S-STOP" class="button m-8 flex-grow-1">STOP</div>
-            <div id="S-RUN" class="button m-8 flex-grow-1">RUN</div>
-            <div id="S-SINGLE" class="button m-8 flex-grow-1">SINGLE STEP</div>
-            <div id="S-EXAMINE" class="button m-8 flex-grow-1">EXAMINE</div>
-            <div id="S-EXAMINE-NEXT" class="button m-8 flex-grow-1">EXAMINE-NEXT</div>
-            <div id="S-DEPOSIT" class="button m-8 flex-grow-1">DEPOSIT</div>
-            <div id="S-DEPOSIT-NEXT" class="button m-8 flex-grow-1">DEPOSIT-NEXT</div>
-            <div id="S-RESET" class="button m-8 flex-grow-1">RESET</div>
+            <div id="SSW-STOP" class="button m-8 flex-grow-1">STOP</div>
+            <div id="SSW-RUN" class="button m-8 flex-grow-1">RUN</div>
+            <div id="SSW-SINGLE" class="button m-8 flex-grow-1">SINGLE STEP</div>
+            <div id="SSW-EXAMINE" class="button m-8 flex-grow-1">EXAMINE</div>
+            <div id="SSW-EXAMINE-NEXT" class="button m-8 flex-grow-1">EXAMINE-NEXT</div>
+            <div id="SSW-DEPOSIT" class="button m-8 flex-grow-1">DEPOSIT</div>
+            <div id="SSW-DEPOSIT-NEXT" class="button m-8 flex-grow-1">DEPOSIT-NEXT</div>
+            <div id="SSW-RESET" class="button m-8 flex-grow-1">RESET</div>
           </div>
         </div>
 
diff --git a/js/panel.js b/js/panel.js
index 46fb072..b011e1d 100644
--- a/js/panel.js
+++ b/js/panel.js
@@ -716,7 +716,7 @@ panel.createSwitch = function(id, type, x, y, upperCmd, lowerCmd) {
                                       panel.onToggle(sourceId);
                                   },
                                   false);
-        // Also installs soft switch handlers.
+        // Also installs helper switch handlers.
         let softSwitchId = 'S-' + id;
         let elem = document.getElementById(softSwitchId);
         elem.addEventListener(
@@ -738,6 +738,16 @@ panel.createSwitch = function(id, type, x, y, upperCmd, lowerCmd) {
                     upperCmd.callback();
                 },
                 false);
+            // Also installs helper switch handlers.
+            cmdElem = document.getElementById('S' + upperCmd.textId);
+            cmdElem.addEventListener(
+                'click',
+                function() {
+                    panel.switchUpThenBack(id);
+                    panel.playSwitch();
+                    upperCmd.callback();
+                },
+                false);
         }
         if (lowerCmd) {
             let cmdElem = document.getElementById(lowerCmd.textId);
@@ -750,6 +760,16 @@ panel.createSwitch = function(id, type, x, y, upperCmd, lowerCmd) {
                     lowerCmd.callback();
                 },
                 false);
+            // Also installs helper switch handlers.
+            cmdElem = document.getElementById('S' + lowerCmd.textId);
+            cmdElem.addEventListener(
+                'click',
+                function() {
+                    panel.switchDownThenBack(id);
+                    panel.playSwitch();
+                    lowerCmd.callback();
+                },
+                false);
         }
     }