diff --git a/src/routes/admin/external-dashboard-management/index.tsx b/src/routes/admin/external-dashboard-management/index.tsx
index bfd608c..600c5d0 100644
--- a/src/routes/admin/external-dashboard-management/index.tsx
+++ b/src/routes/admin/external-dashboard-management/index.tsx
@@ -687,7 +687,7 @@ export default function ExternalDashboardManagementPage() {
                     widgets={widgets()}
                     fields={fields()}
                     mode={'customer_external'}
-                    roleKey={selectedRoleKey()}
+                    roleKey={selectedRoleKey() || formRoleKey()}
                     exploreRoles={roles().map((r) => ({ key: r.key, name: r.name }))}
                     onOpenFullscreen={() => setFormTab('full_preview')}
                   />
@@ -730,7 +730,7 @@ export default function ExternalDashboardManagementPage() {
                       widgets={widgets()}
                       fields={fields()}
                       mode={'customer_external'}
-                      roleKey={selectedRoleKey()}
+                      roleKey={selectedRoleKey() || formRoleKey()}
                       exploreRoles={roles().map((r) => ({ key: r.key, name: r.name }))}
                     />
                   </div>
@@ -869,7 +869,7 @@ export default function ExternalDashboardManagementPage() {
                 widgets={widgets()}
                 fields={fields()}
                 mode={'customer_external'}
-                roleKey={selectedRoleKey()}
+                roleKey={selectedRoleKey() || formRoleKey()}
                 exploreRoles={roles().map((r) => ({ key: r.key, name: r.name }))}
               />
             </div>