diff --git a/src/sunstone/public/app/sunstone/buttons.hbs b/src/sunstone/public/app/sunstone/buttons.hbs
index 766a701404..61c4e47fb3 100644
--- a/src/sunstone/public/app/sunstone/buttons.hbs
+++ b/src/sunstone/public/app/sunstone/buttons.hbs
@@ -78,13 +78,15 @@
 
     <span id='{{customId}}delete_buttons' class='only-sunstone-info only-sunstone-list'></span>
 
-    <ul id="{{customId}}FormTabs" class="tabs right wizard_tabs only-sunstone-form" hidden data-tabs>
-      <li id="wizard_mode" class="tabs-title is-active">
-        <a href="#{{customId}}-wizardForms">{{tr "Wizard"}}</a>
-      </li>
-      <li id="advanced_mode" class="tabs-title">
-        <a href="#{{customId}}-advancedForms">{{tr "Advanced"}}</a>
-      </li>
-    </ul>
+    <span class="only-sunstone-form">
+      <ul id="{{customId}}FormTabs" class="tabs right wizard_tabs " hidden data-tabs>
+        <li id="wizard_mode" class="tabs-title is-active">
+          <a href="#{{customId}}-wizardForms">{{tr "Wizard"}}</a>
+        </li>
+        <li id="advanced_mode" class="tabs-title">
+          <a href="#{{customId}}-advancedForms">{{tr "Advanced"}}</a>
+        </li>
+      </ul>
+    </span>
   </span>