diff --git a/lib/shared/addon/components/confirm-delete/template.hbs b/lib/shared/addon/components/confirm-delete/template.hbs
index 61722530c..682637a1c 100644
--- a/lib/shared/addon/components/confirm-delete/template.hbs
+++ b/lib/shared/addon/components/confirm-delete/template.hbs
@@ -101,12 +101,12 @@
   </div>
 {{/if}}
 <div class="footer-actions">
-  <button class="btn bg-error" type="button" {{action "confirm"}}>
-    {{t "confirmDelete.confirmAction"}}
-  </button>
   <button class="btn bg-transparent" type="button" {{action "cancel"}}>
     {{t "confirmDelete.cancelAction"}}
   </button>
+   <button class="btn bg-error" type="button" {{action "confirm"}}>
+    {{t "confirmDelete.confirmAction"}}
+  </button>
 </div>
 {{#if showProtip}}
   <div class="protip mt-10">
diff --git a/lib/shared/addon/components/save-cancel/template.hbs b/lib/shared/addon/components/save-cancel/template.hbs
index 0c0d63483..243ad2d4b 100644
--- a/lib/shared/addon/components/save-cancel/template.hbs
+++ b/lib/shared/addon/components/save-cancel/template.hbs
@@ -1,3 +1,9 @@
+{{#unless cancelDisabled}}
+  <button class="btn-large btn {{cancelColor}}" type="button" {{action "cancel"}}>
+    {{t cancelLabel}}
+  </button>
+{{/unless}}
+{{yield}}
 {{#if saving}}
   <button class="btn-large btn btn-disabled {{savingColor}}" type="button" {{action "doNothing"}}>
     <i class="icon icon-spinner icon-spin"></i>
@@ -7,10 +13,4 @@
   <button type="submit" {{action "save"}} disabled={{saveDisabled}} class="btn-large btn {{if saved savedColor saveColor}}">
     {{t btnLabel}}
   </button>
-{{/if}}
-{{yield}}
-{{#unless cancelDisabled}}
-  <button class="btn-large btn {{cancelColor}}" type="button" {{action "cancel"}}>
-    {{t cancelLabel}}
-  </button>
-{{/unless}}
+{{/if}}
\ No newline at end of file