diff --git a/templates/fragments/admin/portfolio_members.html b/templates/fragments/admin/portfolio_members.html
index 3b3c05eb..065489a9 100644
--- a/templates/fragments/admin/portfolio_members.html
+++ b/templates/fragments/admin/portfolio_members.html
@@ -11,67 +11,71 @@
       {% include "fragments/flash.html" %}
     {% endif %}
     <base-form inline-template>
-      <form method='POST' id="member-perms" action='{{ url_for("portfolios.edit_portfolio_members", portfolio_id=portfolio.id) }}' autocomplete="off" enctype="multipart/form-data">
-      {{ member_perms_form.csrf_token }}
+      <div>
+        <form method='POST' id="member-perms" action='{{ url_for("portfolios.edit_portfolio_members", portfolio_id=portfolio.id) }}' autocomplete="off" enctype="multipart/form-data">
+        {{ member_perms_form.csrf_token }}
 
-      <div class='application-list-item'>
-        <header>
-          <div class='responsive-table-wrapper__header'>
-            <div class='responsive-table-wrapper__title'>
-              <div class='h3'>{{ "portfolios.admin.portfolio_members_title" | translate }}</div>
-              <div class='subheading'>
-                {{ "portfolios.admin.portfolio_members_subheading" | translate }}
+        <div class='application-list-item'>
+          <header>
+            <div class='responsive-table-wrapper__header'>
+              <div class='responsive-table-wrapper__title'>
+                <div class='h3'>{{ "portfolios.admin.portfolio_members_title" | translate }}</div>
+                <div class='subheading'>
+                  {{ "portfolios.admin.portfolio_members_subheading" | translate }}
+                </div>
               </div>
+
+              <a class='icon-link'>
+                {{ Icon('info') }}
+                {{ "portfolios.admin.settings_info" | translate }}
+              </a>
             </div>
+          </header>
 
-            <a class='icon-link'>
-              {{ Icon('info') }}
-              {{ "portfolios.admin.settings_info" | translate }}
-            </a>
+          {% if not portfolio.members %}
+            <p>{{ "portfolios.admin.no_members" | translate }}</p>
+          {% else %}
+            <table>
+
+              <thead>
+                <tr>
+                    <td>{{ "portfolios.members.permissions.name" | translate }}</td>
+                    <td>{{ "portfolios.members.permissions.app_mgmt" | translate }}</td>
+                    <td>{{ "portfolios.members.permissions.funding" | translate }}</td>
+                    <td>{{ "portfolios.members.permissions.reporting" | translate }}</td>
+                    <td>{{ "portfolios.members.permissions.portfolio_mgmt" | translate }}</td>
+                    <td></td>
+                </tr>
+              </thead>
+
+              <tbody>
+                {% if user_can(permissions.EDIT_PORTFOLIO_USERS) %}
+                  {% include "fragments/admin/members_edit.html" %}
+                {% elif user_can(permissions.VIEW_PORTFOLIO_USERS) %}
+                  {% include "fragments/admin/members_view.html" %}
+                {% endif %}
+              </tbody>
+
+            </table>
           </div>
-        </header>
+        {% endif %}
+        </form>
 
-        {% if not portfolio.members %}
-          <p>{{ "portfolios.admin.no_members" | translate }}</p>
-        {% else %}
-          <table>
+        <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 %}
 
-            <thead>
-              <tr>
-                  <td>{{ "portfolios.members.permissions.name" | translate }}</td>
-                  <td>{{ "portfolios.members.permissions.app_mgmt" | translate }}</td>
-                  <td>{{ "portfolios.members.permissions.funding" | translate }}</td>
-                  <td>{{ "portfolios.members.permissions.reporting" | translate }}</td>
-                  <td>{{ "portfolios.members.permissions.portfolio_mgmt" | translate }}</td>
-                  <td></td>
-              </tr>
-            </thead>
-
-            <tbody>
-              {% if user_can(permissions.EDIT_PORTFOLIO_USERS) %}
-                {% include "fragments/admin/members_edit.html" %}
-              {% elif user_can(permissions.VIEW_PORTFOLIO_USERS) %}
-                {% include "fragments/admin/members_view.html" %}
-              {% endif %}
-            </tbody>
-
-          </table>
+            {% if user_can(permissions.CREATE_PORTFOLIO_USERS) %}
+              {% include "fragments/admin/add_new_portfolio_member.html" %}
+            {% endif %}
+          </div>
         </div>
-      {% endif %}
-      </form>
+      </div>
     </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 %}