diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php
index 7825e37..1e8a536 100644
--- a/app/Providers/Filament/AdminPanelProvider.php
+++ b/app/Providers/Filament/AdminPanelProvider.php
@@ -53,7 +53,7 @@ public function panel(Panel $panel): Panel
             ])
             ->navigationItems([
                 NavigationItem::make('Workspaces')
-                    ->url(fn (): string => route('filament.admin.resources.workspaces.index'))
+                    ->url(fn (): string => ChooseWorkspace::getUrl())
                     ->icon('heroicon-o-squares-2x2')
                     ->group('Settings')
                     ->sort(10),
diff --git a/app/Support/Middleware/EnsureFilamentTenantSelected.php b/app/Support/Middleware/EnsureFilamentTenantSelected.php
index 61e58eb..7f8255a 100644
--- a/app/Support/Middleware/EnsureFilamentTenantSelected.php
+++ b/app/Support/Middleware/EnsureFilamentTenantSelected.php
@@ -2,6 +2,7 @@
 
 namespace App\Support\Middleware;
 
+use App\Filament\Pages\ChooseWorkspace;
 use App\Models\Tenant;
 use App\Models\User;
 use App\Models\Workspace;
@@ -166,7 +167,7 @@ private function configureNavigationForRequest(\Filament\Panel $panel): void
             return app(NavigationBuilder::class)
                 ->item(
                     NavigationItem::make('Workspaces')
-                        ->url(fn (): string => route('filament.admin.resources.workspaces.index'))
+                        ->url(fn (): string => ChooseWorkspace::getUrl())
                         ->icon('heroicon-o-squares-2x2')
                         ->group('Settings')
                         ->sort(10),