diff --git a/frontend/src/Editor/Components/Container.jsx b/frontend/src/Editor/Components/Container.jsx
index 1fcae32397..511546edd3 100644
--- a/frontend/src/Editor/Components/Container.jsx
+++ b/frontend/src/Editor/Components/Container.jsx
@@ -26,8 +26,8 @@ export const Container = function Container({
     border: `1px solid ${borderColor}`,
     height,
     display: visibility ? 'flex' : 'none',
-    overflow: draggedSubContainer ? 'unset' : 'hidden auto',
-    // overflow: 'hidden auto',
+    // overflow: draggedSubContainer ? 'unset' : 'hidden auto',
+    overflow: 'hidden auto',
     position: 'relative',
     boxShadow,
   };
diff --git a/frontend/src/Editor/SubContainer.jsx b/frontend/src/Editor/SubContainer.jsx
index bb3c0c5780..6412a74898 100644
--- a/frontend/src/Editor/SubContainer.jsx
+++ b/frontend/src/Editor/SubContainer.jsx
@@ -154,7 +154,7 @@ export const SubContainer = ({
       if (isParentModal && subContainerHeight <= componentBottom) {
         subContainerHeightRef.current = componentBottom + 100;
       } else {
-        subContainerHeightRef.current = subContainerHeight + 30;
+        subContainerHeightRef.current = subContainerHeight + 28;
       }
     } catch (error) {
       console.error('console.error', error);