diff --git a/assets/javascripts/wizard/templates/components/wizard-step.hbs b/assets/javascripts/wizard/templates/components/wizard-step.hbs
index 8348c769..e1381d0d 100644
--- a/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -28,13 +28,12 @@
   </div>
 
   <div class='wizard-buttons'>
-    {{#if showQuitButton}}
-      <a href {{action "quit"}} class='action-link quit' tabindex="11">{{i18n "wizard.quit"}}</a>
-    {{/if}}
-
     {{#if saving}}
       {{loading-spinner size='small'}}
     {{else}}
+      {{#if showQuitButton}}
+        <a href {{action "quit"}} class='action-link quit' tabindex="11">{{i18n "wizard.quit"}}</a>
+      {{/if}}
       {{#if showBackButton}}
         <a href {{action "backStep"}} class='action-link back' tabindex="11">{{i18n "wizard.back"}}</a>
       {{/if}}