diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 6e8fe71..a7ccaf2 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -264,6 +264,11 @@ export default function App() {
           open={!!pendingConnection}
           onClose={() => setPendingConnection(null)}
           onSubmit={handleEdgeConfirm}
+          initial={
+            pendingConnection?.sourceHandle?.includes('cluster') || pendingConnection?.targetHandle?.includes('cluster')
+              ? { type: 'cluster' }
+              : undefined
+          }
         />
 
         <EdgeModal