diff --git a/packages/web/src/components/workflow/GraphTab.jsx b/packages/web/src/components/workflow/GraphTab.jsx
index 3503371..2d4d80e 100644
--- a/packages/web/src/components/workflow/GraphTab.jsx
+++ b/packages/web/src/components/workflow/GraphTab.jsx
@@ -158,8 +158,10 @@ function GraphTabInner({
     (conn) => {
       if (disabled) return false;
       const from = parseGraphNodeId(conn.source);
+      if (from?.kind !== "step") return false;
+      if (!conn.target) return true;
       const to = parseGraphNodeId(conn.target);
-      if (from?.kind !== "step" || to?.kind !== "step") return false;
+      if (to?.kind !== "step") return false;
       return canConnectSteps(doc, from.uiId, to.uiId);
     },
     [doc, disabled],
@@ -282,8 +284,8 @@ function GraphTabInner({
             onEdgesDelete={onEdgesDelete}
             nodesConnectable={!disabled}
             nodesDraggable={!disabled}
-            elementsSelectable
-            fitView
+            connectionRadius={40}
+            defaultEdgeOptions={{ type: "smoothstep" }}
             proOptions={{ hideAttribution: false }}
           >
             <Background />
diff --git a/packages/web/src/components/workflow/graph/GraphNodes.jsx b/packages/web/src/components/workflow/graph/GraphNodes.jsx
index e0d973d..7ff6f91 100644
--- a/packages/web/src/components/workflow/graph/GraphNodes.jsx
+++ b/packages/web/src/components/workflow/graph/GraphNodes.jsx
@@ -3,7 +3,7 @@ import { Handle, Position } from "@xyflow/react";
 export function TriggerGraphNode({ data, selected }) {
   return (
     <div
-      className={`min-w-44 max-w-56 rounded-box border bg-base-100 px-3 py-2 shadow-sm ${
+      className={`relative min-w-44 max-w-56 rounded-box border bg-base-100 px-3 py-2 shadow-sm ${
         selected ? "border-primary ring-2 ring-primary/40" : "border-base-300"
       }`}
     >
@@ -12,7 +12,7 @@ export function TriggerGraphNode({ data, selected }) {
       <p className="font-mono text-[11px] opacity-70 truncate" title={data.label}>
         {data.label}
       </p>
-      <Handle type="source" position={Position.Right} isConnectable={false} />
+      <Handle type="source" position={Position.Right} isConnectable={false} className="!h-3 !w-3" />
     </div>
   );
 }
@@ -21,7 +21,7 @@ export function StepGraphNode({ data, selected }) {
   const kindLabel = data.kind === "set" ? "set" : data.profile ? "profile" : "script";
   return (
     <div
-      className={`min-w-48 max-w-60 rounded-box border bg-base-100 px-3 py-2 shadow-sm ${
+      className={`relative min-w-48 max-w-60 rounded-box border bg-base-100 px-3 py-2 shadow-sm ${
         data.kind === "set"
           ? "border-secondary"
           : data.profile
@@ -29,7 +29,13 @@ export function StepGraphNode({ data, selected }) {
             : "border-primary"
       } ${selected ? "ring-2 ring-primary/40" : ""}`}
     >
-      <Handle type="target" position={Position.Left} />
+      <Handle
+        type="target"
+        position={Position.Left}
+        id="in"
+        className="!h-3 !w-3 !bg-primary"
+        isConnectable
+      />
       <div className="flex items-center gap-1">
         <p className="text-[10px] uppercase tracking-wide opacity-60">{kindLabel}</p>
         {data.stepId ? (
@@ -52,7 +58,13 @@ export function StepGraphNode({ data, selected }) {
       {data.missingNeeds?.length ? (
         <p className="text-error text-[11px] mt-0.5">Unknown needs: {data.missingNeeds.join(", ")}</p>
       ) : null}
-      <Handle type="source" position={Position.Right} />
+      <Handle
+        type="source"
+        position={Position.Right}
+        id="out"
+        className="!h-3 !w-3 !bg-primary"
+        isConnectable
+      />
     </div>
   );
 }
diff --git a/packages/web/src/index.css b/packages/web/src/index.css
index 5542848..65cc7b7 100644
--- a/packages/web/src/index.css
+++ b/packages/web/src/index.css
@@ -29,3 +29,7 @@ body,
   width: 100%;
   height: 100%;
 }
+
+.workflow-graph .react-flow__handle {
+  opacity: 1;
+}