diff --git a/src/pages/api-keys/components/add-apikey-modal/index.tsx b/src/pages/api-keys/components/add-apikey-modal/index.tsx
index e91b8fe4..14ab4b8e 100644
--- a/src/pages/api-keys/components/add-apikey-modal/index.tsx
+++ b/src/pages/api-keys/components/add-apikey-modal/index.tsx
@@ -182,15 +182,20 @@ const AddModal: React.FC<AddModalProps> = ({
     }
     if (action === PageAction.EDIT && currentData && open) {
       parseExpireValue(currentData as ListItem);
+      const isLegacyAllScope = currentData.scope?.includes('*');
+      const normalizedScope = isLegacyAllScope
+        ? ['management', 'inference']
+        : currentData.scope;
+      const normalizedAllowedModelNames = isLegacyAllScope
+        ? []
+        : currentData.allowed_model_names || [];
       form.setFieldsValue({
         name: currentData.name,
         description: currentData.description,
-        scope: currentData.scope,
-        allowed_type: currentData.allowed_model_names?.length
-          ? 'custom'
-          : 'all',
+        scope: normalizedScope,
+        allowed_type: normalizedAllowedModelNames.length ? 'custom' : 'all',
         expires_in: parseExpireValue(currentData as ListItem),
-        allowed_model_names: currentData.allowed_model_names || []
+        allowed_model_names: normalizedAllowedModelNames
       });
     }
 
diff --git a/src/pages/api-keys/hooks/use-keys-columns.tsx b/src/pages/api-keys/hooks/use-keys-columns.tsx
index f73b6f72..0a441465 100644
--- a/src/pages/api-keys/hooks/use-keys-columns.tsx
+++ b/src/pages/api-keys/hooks/use-keys-columns.tsx
@@ -108,12 +108,14 @@ const useModelsColumns = ({
         },
         render: (text: string[], record: ListItem) => (
           <div className="flex-column gap-4">
-            {record.scope?.includes('management') && (
+            {(record.scope?.includes('management') ||
+              record.scope?.includes('*')) && (
               <AutoTooltip ghost>
                 {intl.formatMessage({ id: 'apikeys.accessScope.management' })}
               </AutoTooltip>
             )}
-            {record.scope?.includes('inference') && (
+            {(record.scope?.includes('inference') ||
+              record.scope?.includes('*')) && (
               <div
                 style={{
                   border: '1px solid var(--ant-color-split)',
diff --git a/src/pages/api-keys/index.tsx b/src/pages/api-keys/index.tsx
index 14aeb49e..d3369b6a 100644
--- a/src/pages/api-keys/index.tsx
+++ b/src/pages/api-keys/index.tsx
@@ -163,7 +163,7 @@ const APIKeys: React.FC = () => {
           marginTop={30}
           showSelect={currentUser?.is_admin}
           selectOptions={userList}
-          select={{ showSearch: true }}
+          select={{ showSearch: { optionFilterProp: 'label' } }}
           selectHolder={intl.formatMessage({ id: 'models.table.filterByName' })}
           buttonText={intl.formatMessage({ id: 'apikeys.button.create' })}
           handleSearch={handleSearch}