diff --git a/js/components/forms/multi_step_modal_form.js b/js/components/forms/multi_step_modal_form.js
index 7b5e0ebf..8ddac376 100644
--- a/js/components/forms/multi_step_modal_form.js
+++ b/js/components/forms/multi_step_modal_form.js
@@ -34,6 +34,7 @@ export default {
 
   mounted: function() {
     this.$root.$on('field-change', this.handleValidChange)
+    this.$on('modalOpen', this.handleModalOpen)
   },
 
   methods: {
@@ -61,6 +62,9 @@ export default {
       const { name, optional } = event
       this.fields[name] = optional
     },
+    handleModalOpen: function(_bool) {
+      this.step = 0
+    }
   },
 
   computed: {},
diff --git a/templates/components/multi_step_modal_form.html b/templates/components/multi_step_modal_form.html
index 5392c6d9..f749dc4b 100644
--- a/templates/components/multi_step_modal_form.html
+++ b/templates/components/multi_step_modal_form.html
@@ -36,12 +36,14 @@
       <form action="{{ form_action }}" method="POST">
         {{ form.csrf_token }}
         {% call Modal(name=name, dismissable=dismissable, classes="wide") %}
-          {% for step in steps %}
-            <div class="modal__form" v-show="step === {{ loop.index0 }}">
-              {{ FormSteps(step_count, loop.index) }}
-              {{ step }}
-            </div>
-          {% endfor %}
+          <div v-if="activeModal === '{{ name }}'">
+            {% for step in steps %}
+              <div class="modal__form" v-show="step === {{ loop.index0 }}">
+                {{ FormSteps(step_count, loop.index) }}
+                {{ step }}
+              </div>
+            {% endfor %}
+          </div>
         {% endcall %}
       </form>
     </div>