diff --git a/js/components/forms/base_form.js b/js/components/forms/base_form.js
index 749365ba..535a098d 100644
--- a/js/components/forms/base_form.js
+++ b/js/components/forms/base_form.js
@@ -22,5 +22,5 @@ export default {
     levelofwarrant,
     Modal,
   },
-  mixins: [FormMixin, Modal],
+  mixins: [FormMixin],
 }
diff --git a/templates/fragments/admin/portfolio_members.html b/templates/fragments/admin/portfolio_members.html
index 0c87abe8..3b3c05eb 100644
--- a/templates/fragments/admin/portfolio_members.html
+++ b/templates/fragments/admin/portfolio_members.html
@@ -57,22 +57,22 @@
 
           </table>
         </div>
-        <div class="panel__footer">
-          <div class="action-group save">
-            {% if user_can(permissions.EDIT_PORTFOLIO_USERS) %}
-              {{ SaveButton(text=('common.save' | translate), element="input", form="member-perms") }}
-            {% endif %}
-
-            {% if user_can(permissions.CREATE_PORTFOLIO_USERS) %}
-              {% include "fragments/admin/add_new_portfolio_member.html" %}
-            {% endif %}
-          </div>
-        </div>
-
       {% endif %}
       </form>
     </base-form>
 
+    <div class="panel__footer">
+      <div class="action-group save">
+        {% if user_can(permissions.EDIT_PORTFOLIO_USERS) %}
+          {{ SaveButton(text=('common.save' | translate), element="input", form="member-perms") }}
+        {% endif %}
+
+        {% if user_can(permissions.CREATE_PORTFOLIO_USERS) %}
+          {% include "fragments/admin/add_new_portfolio_member.html" %}
+        {% endif %}
+      </div>
+    </div>
+
     {% if user_can(permissions.EDIT_PORTFOLIO_USERS) %}
       {% for member in portfolio.members %}
         {% set modal_id = "portfolio_id_{}_user_id_{}".format(portfolio.id, member.user_id) %}