diff --git a/packages/app/src/components/agent-details-sheet.tsx b/packages/app/src/components/agent-details-sheet.tsx
index 97f3a08f4..d04e94c69 100644
--- a/packages/app/src/components/agent-details-sheet.tsx
+++ b/packages/app/src/components/agent-details-sheet.tsx
@@ -133,7 +133,7 @@ const styles = StyleSheet.create((theme) => ({
     borderWidth: theme.borderWidth[1],
     borderColor: theme.colors.surface2,
     backgroundColor: theme.colors.surface1,
-    paddingHorizontal: theme.spacing[5],
+    paddingHorizontal: theme.spacing[4],
     paddingVertical: theme.spacing[4],
     gap: theme.spacing[3],
   },
diff --git a/packages/app/src/utils/agent-grouping.ts b/packages/app/src/utils/agent-grouping.ts
index c88fceb6d..be3cc6b27 100644
--- a/packages/app/src/utils/agent-grouping.ts
+++ b/packages/app/src/utils/agent-grouping.ts
@@ -148,6 +148,10 @@ export function parseRepoShortNameFromRemoteUrl(
  * Extracts the project name from a path (last segment).
  */
 export function deriveProjectName(projectKey: string): string {
+  const githubRemotePrefix = "remote:github.com/";
+  if (projectKey.startsWith(githubRemotePrefix)) {
+    return projectKey.slice(githubRemotePrefix.length) || projectKey;
+  }
   const segments = projectKey.split("/").filter(Boolean);
   return segments[segments.length - 1] || projectKey;
 }