diff --git a/packages/toolkit/src/view/pipeline-builder/Flow.tsx b/packages/toolkit/src/view/pipeline-builder/Flow.tsx
index 1755b10d8..9f8de8e71 100644
--- a/packages/toolkit/src/view/pipeline-builder/Flow.tsx
+++ b/packages/toolkit/src/view/pipeline-builder/Flow.tsx
@@ -175,6 +175,8 @@ export const Flow = React.forwardRef<HTMLDivElement, FlowProps>(
 
                 console.warn(msg);
               }}
+              elevateNodesOnSelect={true}
+              selectionOnDrag={true}
             >
               <Controls
                 id={pipelineName ?? undefined}
diff --git a/packages/toolkit/src/view/pipeline-builder/FlowControl.tsx b/packages/toolkit/src/view/pipeline-builder/FlowControl.tsx
index 8db0978e0..07e62dbec 100644
--- a/packages/toolkit/src/view/pipeline-builder/FlowControl.tsx
+++ b/packages/toolkit/src/view/pipeline-builder/FlowControl.tsx
@@ -443,8 +443,6 @@ export const FlowControl = (props: FlowControlProps) => {
         throw new Error("Component type is not defined");
       }
 
-      console.log(resource);
-
       if ("configuration" in resource) {
         // Create a new array to let reactflow rerender the component
         newNodes = [
@@ -474,6 +472,7 @@ export const FlowControl = (props: FlowControlProps) => {
               x: viewport.x,
               y: viewport.y,
             }),
+            zIndex: 20,
           },
         ];
       } else {
@@ -499,6 +498,7 @@ export const FlowControl = (props: FlowControlProps) => {
               note: null,
             },
             position: newNodeXY,
+            zIndex: 20,
           },
         ];
       }
@@ -525,6 +525,7 @@ export const FlowControl = (props: FlowControlProps) => {
             note: null,
           },
           position: newNodeXY,
+          zIndex: 20,
         },
       ];
     }