diff --git a/src/pages/api-keys/components/add-apikey-modal/form.tsx b/src/pages/api-keys/components/add-apikey-modal/form.tsx
index 911203a7..2ac99d30 100644
--- a/src/pages/api-keys/components/add-apikey-modal/form.tsx
+++ b/src/pages/api-keys/components/add-apikey-modal/form.tsx
@@ -47,7 +47,12 @@ const APIKeyForm: React.FC<{
 
       <PluginExtraFields
         name="CreateOrgScopeField"
-        context={{ action, allowPersonal: true }}
+        context={{
+          action,
+          allowPersonal: true,
+          allowGlobal: true,
+          globalLabelId: 'scope.global'
+        }}
       />
 
       <Form.Item<FormData>
diff --git a/src/pages/api-keys/config/types.ts b/src/pages/api-keys/config/types.ts
index b0a8ecfe..f26e6155 100644
--- a/src/pages/api-keys/config/types.ts
+++ b/src/pages/api-keys/config/types.ts
@@ -6,10 +6,10 @@ export interface ListItem {
   masked_value?: string;
   user_id?: number;
   user_name?: string;
-  // The owning principal — an Org, or a USER principal when the key
-  // was created in someone's Personal Org. Read by the enterprise
-  // plugin's Organization column in the admin All-org view.
-  owner_principal_id?: number;
+  // The owning principal — an Org, or a USER principal for a
+  // personal-scope key, or NULL for an admin "All" mode key (no
+  // tenant pinning).
+  owner_principal_id?: number | null;
   created_at: string;
   updated_at: string;
   expires_at: string;