diff --git a/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.module.css b/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.module.css
index 4a43cb62de..13929c8905 100644
--- a/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.module.css
+++ b/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.module.css
@@ -53,3 +53,13 @@
   max-height: 600px;
   padding: 4px 0px;
 }
+
+.propertiesListOverflow {
+  composes: branding-overflow from global;
+  position: sticky;
+  flex-shrink: 0;
+  bottom: -4px;
+  width: 100%;
+  height: 24px;
+  pointer-events: none;
+}
diff --git a/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.tsx b/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.tsx
index e035cb82ce..4c92b0b6d6 100644
--- a/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.tsx
+++ b/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.tsx
@@ -37,10 +37,11 @@ interface Props {
   staticProperties?: boolean;
   filterable?: boolean;
   sortByName?: boolean;
+  disableBottomPadding?: boolean;
 }
 
 export const PropertiesTable = observer<Props>(function PropertiesTable(props) {
-  const { className, onAdd, readOnly, propertiesState } = props;
+  const { className, onAdd, readOnly, propertiesState, disableBottomPadding = false } = props;
   const translate = useTranslate();
   const propsRef = useObjectRef({ ...props });
   const style = useS(styles);
@@ -165,6 +166,7 @@ export const PropertiesTable = observer<Props>(function PropertiesTable(props) {
             onRemove={removeProperty}
           />
         ))}
+        {!disableBottomPadding && <div className={s(style, { propertiesListOverflow: true })} />}
       </div>
     </div>
   );
diff --git a/webapp/packages/plugin-sql-editor/src/renderQueryParamsForConfirmation.tsx b/webapp/packages/plugin-sql-editor/src/renderQueryParamsForConfirmation.tsx
index d63429d4bd..175b624587 100644
--- a/webapp/packages/plugin-sql-editor/src/renderQueryParamsForConfirmation.tsx
+++ b/webapp/packages/plugin-sql-editor/src/renderQueryParamsForConfirmation.tsx
@@ -92,6 +92,7 @@ const RenderParametersForm = observer(function RenderParametersForm({
           className="tw:overflow-auto"
           sortByName={false}
           staticProperties
+          disableBottomPadding
         />
       </div>