diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py
index 4e5167f33a93c055143964ceb40f03599085edbf..214436f296f078add7c38b0c598bfef010394c5f 100644
--- a/opentech/apply/funds/views.py
+++ b/opentech/apply/funds/views.py
@@ -296,15 +296,6 @@ class UpdateReviewersView(DelegatedViewMixin, UpdateView):
     form_class = UpdateReviewersForm
     context_name = 'reviewer_form'
 
-    def form_invalid(self, form):
-        messages.error(
-            self.request,
-            mark_safe(
-                "There are errors with the Reviewers Form:" + form.errors.as_ul()
-            )
-        )
-        return super().form_invalid(form)
-
     def form_valid(self, form):
         old_reviewers = set(
             copy(reviewer)
diff --git a/opentech/static_src/src/javascript/apply/fancybox-global.js b/opentech/static_src/src/javascript/apply/fancybox-global.js
index 616c78f49aa0bb3ea7e7990687c7bb680babe55e..a97f5945111e424ef0748e925507cc7917f21d06 100644
--- a/opentech/static_src/src/javascript/apply/fancybox-global.js
+++ b/opentech/static_src/src/javascript/apply/fancybox-global.js
@@ -18,4 +18,16 @@
         $('.django-select2-checkboxes').select2('close');
     });
 
+    $(document).ready(
+        $('.modal').each((idx, element) => {
+            var modal = $(element);
+            var error = modal.has('.errorlist');
+            if ( error.length ) {
+                const modalID = modal.attr('id');
+                const buttonTrigger = $(`[data-src="#${modalID}"]`);
+                buttonTrigger[0].click();
+            }
+        })
+    );
+
 })(jQuery);