diff --git a/packages/toolpad-app/src/components/AppEditor/PageEditor/QueryEditor.tsx b/packages/toolpad-app/src/components/AppEditor/PageEditor/QueryEditor.tsx
index d879b369175..be2150a3591 100644
--- a/packages/toolpad-app/src/components/AppEditor/PageEditor/QueryEditor.tsx
+++ b/packages/toolpad-app/src/components/AppEditor/PageEditor/QueryEditor.tsx
@@ -337,9 +337,6 @@ function QueryNodeEditorDialog<Q, P>({
                 flex: 1,
                 minWidth: 0,
                 overflow: 'auto',
-                gap: 2,
-                px: 3,
-                py: 1,
               }}
             >
               <ConnectionContextProvider value={queryEditorContext}>
@@ -355,9 +352,9 @@ function QueryNodeEditorDialog<Q, P>({
                 />
               </ConnectionContextProvider>
 
-              <Grid container direction="row" spacing={1}>
-                {/* TODO: move transform inside of the dataSource.QueryEditor and remove the conditional */}
-                {dataSourceId === 'function' ? null : (
+              {/* TODO: move transform inside of the dataSource.QueryEditor and remove the conditional */}
+              {dataSourceId === 'function' ? null : (
+                <Grid container direction="row" spacing={1} sx={{ px: 3, pb: 1, mt: 2 }}>
                   <React.Fragment>
                     <Divider />
                     <Grid item xs={6}>
@@ -384,9 +381,10 @@ function QueryNodeEditorDialog<Q, P>({
                       </Stack>
                     </Grid>
                   </React.Fragment>
-                )}
-              </Grid>
+                </Grid>
+              )}
             </Stack>
+
             {/* TODO: move preview inside of the dataSource.QueryEditor and remove the conditional */}
             {dataSourceId === 'function' ? null : (
               <Box
diff --git a/packages/toolpad-app/src/toolpadDataSources/googleSheets/client.tsx b/packages/toolpad-app/src/toolpadDataSources/googleSheets/client.tsx
index 101161a0d59..6ee8e989a42 100644
--- a/packages/toolpad-app/src/toolpadDataSources/googleSheets/client.tsx
+++ b/packages/toolpad-app/src/toolpadDataSources/googleSheets/client.tsx
@@ -129,7 +129,7 @@ function QueryEditor({
   );
 
   return (
-    <Stack direction="column" gap={2}>
+    <Stack direction="column" gap={2} sx={{ px: 3, pt: 1 }}>
       <Autocomplete
         fullWidth
         value={fetchedFile.data ?? null}
diff --git a/packages/toolpad-app/src/toolpadDataSources/rest/client.tsx b/packages/toolpad-app/src/toolpadDataSources/rest/client.tsx
index ea5f0f49ca4..5a4992f054a 100644
--- a/packages/toolpad-app/src/toolpadDataSources/rest/client.tsx
+++ b/packages/toolpad-app/src/toolpadDataSources/rest/client.tsx
@@ -201,7 +201,7 @@ function QueryEditor({
   });
 
   return (
-    <Stack gap={2}>
+    <Stack gap={2} sx={{ px: 3, pt: 1 }}>
       <Typography>Parameters</Typography>
       <ParametersEditor
         value={params}