diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/ConnectionLines.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/ConnectionLines.tsx
index 5a3f3f32767..3cb3758cc39 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/ConnectionLines.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/ConnectionLines.tsx
@@ -150,6 +150,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
     pointerEvents: 'none',
     zIndex: 10,
     overflow: 'visible',
+    width: '100%',
   }),
   connectionGroup: css({
     [theme.transitions.handleMotion('no-preference', 'reduce')]: {
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/QueryTransformList.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/QueryTransformList.tsx
index fb6b0055276..5323ba9988a 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/QueryTransformList.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/QueryTransformList.tsx
@@ -187,12 +187,12 @@ export const QueryTransformList = memo(
             </span>
           </Stack>
         </div>
-        <div className={styles.scrollWrapper}>
-          <ScrollContainer data-scrollcontainer>
+        <div className={styles.scrollWrapper} data-testid="query-transform-list-scroll-wrapper">
+          <ScrollContainer data-scrollcontainer height="100%">
             <div className={styles.contentWrapper}>
               <ConnectionLines connections={visibleConnections} isDragging={isDragging} />
               <DragDropContext onDragStart={onDragStart} onDragEnd={onDragEnd}>
-                <div className={styles.content}>
+                <div className={styles.content} data-testid="query-transform-list-content">
                   <Stack direction="column" gap={3}>
                     {/* Data Sources Section (Queries + Expressions) */}
                     {dataSourceItems.length > 0 && (
@@ -365,8 +365,6 @@ const getStyles = (theme: GrafanaTheme2) => {
       display: 'flex',
       alignItems: 'center',
       gap: theme.spacing(1),
-      marginLeft: theme.spacing(-2),
-      marginRight: theme.spacing(-2),
       '&::after': {
         content: '""',
         flex: 1,
@@ -383,7 +381,7 @@ const getStyles = (theme: GrafanaTheme2) => {
       minHeight: '100%',
     }),
     content: css({
-      padding: `${theme.spacing(2)} ${theme.spacing(8)} ${theme.spacing(4)} ${theme.spacing(6)}`,
+      padding: `${theme.spacing(2)} ${theme.spacing(8)} ${theme.spacing(2)} ${theme.spacing(2)}`,
       position: 'relative',
     }),
     dragging: css({