diff --git a/octoprint_customControl/templates/customControl_hookedsettings.jinja2 b/octoprint_customControl/templates/customControl_hookedsettings.jinja2
index 62600d2..dac3f74 100644
--- a/octoprint_customControl/templates/customControl_hookedsettings.jinja2
+++ b/octoprint_customControl/templates/customControl_hookedsettings.jinja2
@@ -87,8 +87,7 @@
 <script type="text/html" id="settingsCustomControls_controlTemplate">
     <form class="form-inline custom_control" style="min-height:15px; border:1px dotted #000000" data-bind="contextMenu: { menuSelector: '#commandContextMenu', menuSelected: $root.controlContextMenu }, css: { 'sortable': $parent.layout() != 'horizontal_grid' }, attr: { 'id': id }">
         <!-- ko template: { name: 'settingsCustomControls_controlTemplate_input', data: $data, if: $data.hasOwnProperty('input') } --><!-- /ko -->
-				<!-- ko template: { name: 'settingsCustomControls_controlTemplate_command', data: $data, if: !$data.hasOwnProperty('customClass') && ($data.hasOwnProperty('command') || $data.hasOwnProperty('commands') || $data.hasOwnProperty('script') || $data.hasOwnProperty('javascript')) } --><!-- /ko -->
-        <!-- ko template: { name: 'settingsCustomControls_controlTemplate_command_customClass', data: $data, if: $data.hasOwnProperty('customClass') && ($data.hasOwnProperty('command') || $data.hasOwnProperty('commands') || $data.hasOwnProperty('script') || $data.hasOwnProperty('javascript')) } --><!-- /ko -->
+				<!-- ko template: { name: 'settingsCustomControls_controlTemplate_command', data: $data, if: $data.hasOwnProperty('command') || $data.hasOwnProperty('commands') || $data.hasOwnProperty('script') || $data.hasOwnProperty('javascript') } --><!-- /ko -->
         <!-- ko template: { name: 'settingsCustomControls_controlTemplate_output', data: $data, if: $data.hasOwnProperty('value') } --><!-- /ko -->
     </form>
 </script>
@@ -107,9 +106,11 @@
     <label style="cursor: default" data-bind="text: value"></label>
 </script>
 <script type="text/html" id="settingsCustomControls_controlTemplate_command">
-    <button class="btn" data-bind="text: name" onclick="event.preventDefault()"></button>
-</script>
-<script type="text/html" id="settingsCustomControls_controlTemplate_command_customClass">
-    <button data-bind="text: name, attr: { 'class': customClass }" onclick="event.preventDefault()"></button>
+    <!-- ko if: $data.customClass -->
+				<button data-bind="text: name, attr: { 'class': customClass }" onclick="event.preventDefault()"></button>
+    <!-- /ko -->
+    <!-- ko ifnot: $data.customClass -->
+        <button class="btn" data-bind="text: name" onclick="event.preventDefault()"></button>
+    <!-- /ko -->
 </script>
 <!-- End of templates for custom controls -->