diff --git a/app/javascript/submission_form/form.vue b/app/javascript/submission_form/form.vue
index 35000ba1..285ef24a 100644
--- a/app/javascript/submission_form/form.vue
+++ b/app/javascript/submission_form/form.vue
@@ -731,6 +731,11 @@ export default {
   watch: {
     expand (value) {
       this.isFormVisible = value
+    },
+    currentStepFields (value) {
+      if (!value) {
+        this.currentStep -= 1
+      }
     }
   },
   mounted () {