diff --git a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
index 8b568b66c36..82e8bd6d0d7 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -1,16 +1,18 @@
-{{#if step.title}}
-  <h1 class='wizard-step-title'>{{step.title}}</h1>
-{{/if}}
+<div class='wizard-step-contents'>
+  {{#if step.title}}
+    <h1 class='wizard-step-title'>{{step.title}}</h1>
+  {{/if}}
 
-{{#if step.description}}
-  <p class='wizard-step-description'>{{{step.description}}}</p>
-{{/if}}
+  {{#if step.description}}
+    <p class='wizard-step-description'>{{{step.description}}}</p>
+  {{/if}}
 
-{{#wizard-step-form step=step}}
-  {{#each step.fields as |field|}}
-    {{wizard-field field=field step=step}}
-  {{/each}}
-{{/wizard-step-form}}
+  {{#wizard-step-form step=step}}
+    {{#each step.fields as |field|}}
+      {{wizard-field field=field step=step}}
+    {{/each}}
+  {{/wizard-step-form}}
+</div>
 
 <div class='wizard-step-footer'>
   <div class='wizard-progress'>
diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index cca2f2421df..6354b9186c0 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -31,6 +31,10 @@ body.wizard {
   width: 100%;
   border: 1px solid #ccc;
 
+  .wizard-step-contents {
+    min-height: 460px;
+  }
+
   .wizard-column-contents {
     padding: 1.2em;