diff --git a/src/sunstone/public/app/tabs/templates-tab/dialogs/clone.js b/src/sunstone/public/app/tabs/templates-tab/dialogs/clone.js
index a76e63837f..7f6cd99ceb 100644
--- a/src/sunstone/public/app/tabs/templates-tab/dialogs/clone.js
+++ b/src/sunstone/public/app/tabs/templates-tab/dialogs/clone.js
@@ -75,7 +75,7 @@ define(function(require) {
       return false;
     });
 
-    $('#' + DIALOG_ID + 'Form', context).on("click", "button", function() {
+    $('#' + DIALOG_ID + 'Form', context).on("click", "button.custom_submit", function() {
       if(!$('#' + DIALOG_ID + 'Form', context)[0].checkValidity()){
         if ($(this).val() == that.resource+".clone_recursive"){
           $('#' + DIALOG_ID + 'Form button[type="submit"]', context).click();
diff --git a/src/sunstone/public/app/tabs/templates-tab/dialogs/clone/html.hbs b/src/sunstone/public/app/tabs/templates-tab/dialogs/clone/html.hbs
index df7c0c7978..41bc62e185 100644
--- a/src/sunstone/public/app/tabs/templates-tab/dialogs/clone/html.hbs
+++ b/src/sunstone/public/app/tabs/templates-tab/dialogs/clone/html.hbs
@@ -41,13 +41,11 @@
       </div>
     </div>
     <div class="form_buttons row">
-      <button type="button" class="button radius right" value="Template.clone_recursive">{{tr "Clone with Images"}}</button>
-      <button type="submit" class="button radius right" value="Template.clone">{{tr "Clone"}}</button>
-    </div>
-    <div id="{{dialogId}}" class="reveal" data-reveal>
-      <button class="close-button" data-close aria-label="{{tr "Close modal"}}" type="button">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="custom_submit button radius right" value="Template.clone_recursive">{{tr "Clone with Images"}}</button>
+      <button type="submit" class="custom_submit button radius right" value="Template.clone">{{tr "Clone"}}</button>
     </div>
+    <button class="close-button" data-close aria-label="{{tr "Close modal"}}" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
   </form>
 </div>