diff --git a/app/Filament/Resources/ApiKeyResource/Pages/CreateApiKey.php b/app/Filament/Resources/ApiKeyResource/Pages/CreateApiKey.php
index e8abde957..1922d95cc 100644
--- a/app/Filament/Resources/ApiKeyResource/Pages/CreateApiKey.php
+++ b/app/Filament/Resources/ApiKeyResource/Pages/CreateApiKey.php
@@ -25,24 +25,10 @@ class CreateApiKey extends CreateRecord
                     ->default(auth()->user()->id)
                     ->required(),
 
-                Forms\Components\Select::make('key_type')
+                Forms\Components\Hidden::make('key_type')
                     ->inlineLabel()
-                    ->options(function (ApiKey $apiKey) {
-                        $originalOptions = [
-                            //ApiKey::TYPE_NONE => 'None',
-                            ApiKey::TYPE_ACCOUNT => 'Account',
-                            ApiKey::TYPE_APPLICATION => 'Application',
-                            //ApiKey::TYPE_DAEMON_USER => 'Daemon User',
-                            //ApiKey::TYPE_DAEMON_APPLICATION => 'Daemon Application',
-                        ];
-
-                        return collect($originalOptions)
-                            ->filter(fn ($value, $key) => $key <= ApiKey::TYPE_APPLICATION || $apiKey->key_type === $key)
-                            ->all();
-                    })
-                    ->selectablePlaceholder(false)
-                    ->required()
-                    ->default(ApiKey::TYPE_APPLICATION),
+                    ->default(ApiKey::TYPE_APPLICATION)
+                    ->required(),
 
                 Forms\Components\Fieldset::make('Permissions')
                     ->columns([
diff --git a/app/Filament/Resources/ApiKeyResource/Pages/ListApiKeys.php b/app/Filament/Resources/ApiKeyResource/Pages/ListApiKeys.php
index 0932848eb..f297f0220 100644
--- a/app/Filament/Resources/ApiKeyResource/Pages/ListApiKeys.php
+++ b/app/Filament/Resources/ApiKeyResource/Pages/ListApiKeys.php
@@ -19,6 +19,7 @@ class ListApiKeys extends ListRecords
     {
         return $table
             ->searchable(false)
+            ->modifyQueryUsing(fn ($query) => $query->where('key_type', ApiKey::TYPE_APPLICATION))
             ->columns([
                 Tables\Columns\TextColumn::make('user.username')
                     ->hidden()
@@ -64,22 +65,4 @@ class ListApiKeys extends ListRecords
             Actions\CreateAction::make(),
         ];
     }
-
-    public function getTabs(): array
-    {
-        return [
-            'all' => Tab::make('All Keys'),
-            'application' => Tab::make('Application Keys')
-                ->modifyQueryUsing(fn (Builder $query) => $query->where('key_type', ApiKey::TYPE_APPLICATION)
-                ),
-            'account' => Tab::make('Account Keys')
-                ->modifyQueryUsing(fn (Builder $query) => $query->where('key_type', ApiKey::TYPE_ACCOUNT)
-                ),
-        ];
-    }
-
-    public function getDefaultActiveTab(): string|int|null
-    {
-        return 'application';
-    }
 }