diff --git a/src/components/DevboxCreatePage.tsx b/src/components/DevboxCreatePage.tsx
index 6de5f97..9fe8828 100644
--- a/src/components/DevboxCreatePage.tsx
+++ b/src/components/DevboxCreatePage.tsx
@@ -459,8 +459,8 @@ export const DevboxCreatePage = ({
         return;
       }
 
-      // Handle Enter on any field to submit
-      if (key.return) {
+      // Enter on the create button to submit
+      if (currentField === "create" && key.return) {
         handleCreate();
         return;
       }
@@ -1918,7 +1918,6 @@ export const DevboxCreatePage = ({
                 onChange={(value) =>
                   setFormData({ ...formData, [field.key]: value })
                 }
-                onSubmit={handleCreate}
                 isActive={isActive}
                 placeholder={field.placeholder}
               />
diff --git a/src/services/agentService.ts b/src/services/agentService.ts
index 3f41177..7083465 100644
--- a/src/services/agentService.ts
+++ b/src/services/agentService.ts
@@ -11,6 +11,9 @@ export interface ListAgentsOptions {
   limit?: number;
   startingAfter?: string;
   publicOnly?: boolean;
+  privateOnly?: boolean;
+  name?: string;
+  search?: string;
 }
 
 export interface ListAgentsResult {
@@ -32,6 +35,8 @@ export async function listAgents(
     limit?: number;
     starting_after?: string;
     is_public?: boolean;
+    name?: string;
+    search?: string;
   } = {
     limit: options.limit || 50,
   };
@@ -40,9 +45,18 @@ export async function listAgents(
     queryParams.starting_after = options.startingAfter;
   }
 
-  // Use API filter for public agents
   if (options.publicOnly) {
     queryParams.is_public = true;
+  } else if (options.privateOnly) {
+    queryParams.is_public = false;
+  }
+
+  if (options.name) {
+    queryParams.name = options.name;
+  }
+
+  if (options.search) {
+    queryParams.search = options.search;
   }
 
   const page = await client.agents.list(queryParams);