diff --git a/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.html b/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.html
index 0e5fe097b..c678c84b1 100644
--- a/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.html
+++ b/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.html
@@ -59,16 +59,21 @@
         </mat-form-field>
       </div>
     }
-
+  </div>
+  <span>
     @if (showFilterPanel) {
-      <div class="mt-4">
-        <h2 class="filter-settings-title" i18n>Filter Settings (Optional)</h2>
+      <h1 class="filter-settings-title" i18n mat-dialog-title>
+        Filter Settings (Optional)
+      </h1>
+      <div class="flex-grow-1 py-0" mat-dialog-content>
         <p class="filter-settings-description text-muted" i18n>
           Configure which accounts, holdings, tags, and asset classes will be
           visible in this public access. Leave empty to show all data.
         </p>
 
         <gf-portfolio-filter-form
+          appearance="outline"
+          class="w-100"
           formControlName="filters"
           [accounts]="accounts"
           [assetClasses]="assetClasses"
@@ -77,7 +82,7 @@
         />
       </div>
     }
-  </div>
+  </span>
   <div class="justify-content-end" mat-dialog-actions>
     <button mat-button type="button" (click)="onCancel()">
       @if (accessForm.dirty) {
diff --git a/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.scss b/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.scss
index ac08fa42d..b63df0134 100644
--- a/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.scss
+++ b/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.scss
@@ -4,21 +4,4 @@
   .mat-mdc-dialog-content {
     max-height: unset;
   }
-
-  ion-icon {
-    &.rotate-90 {
-      transform: rotate(90deg);
-    }
-  }
-
-  .filter-settings-title {
-    font-size: 1.125rem;
-    font-weight: 500;
-    margin-bottom: 1rem;
-  }
-
-  .filter-settings-description {
-    font-size: 0.875rem;
-    margin-bottom: 1rem;
-  }
 }