app/Providers/Filament/AdminPanelProvider.php

@@ -53,7 +53,15 @@ public function panel(Panel $panel): Panel
             ])
             ->navigationItems([
                 NavigationItem::make('Workspaces')
-                    ->url(fn (): string => ChooseWorkspace::getUrl())
+                    ->url(function (): string {
+                        $tenant = Filament::getTenant();
+
+                        if ($tenant instanceof Tenant) {
+                            return route('filament.admin.resources.workspaces.index', ['tenant' => $tenant->external_id]);
+                        }
+
+                        return ChooseWorkspace::getUrl();
+                    })
                     ->icon('heroicon-o-squares-2x2')
                     ->group('Settings')
                     ->sort(10),

tests/Feature/Filament/TenantDashboardDbOnlyTest.php

@@ -32,6 +32,7 @@
     assertNoOutboundHttp(function () use ($tenant): void {
         $this->get(TenantDashboard::getUrl(tenant: $tenant))
             ->assertOk()
+            ->assertSee("/admin/t/{$tenant->external_id}/workspaces", false)
             ->assertSee('Needs Attention')
             ->assertSee('Recent Operations')
             ->assertSee('Recent Drift Findings');