diff --git a/app/client/src/components/editorComponents/PropertyPaneSidebar.tsx b/app/client/src/components/editorComponents/PropertyPaneSidebar.tsx
index ca6d5d417e8..bfa50589dc6 100644
--- a/app/client/src/components/editorComponents/PropertyPaneSidebar.tsx
+++ b/app/client/src/components/editorComponents/PropertyPaneSidebar.tsx
@@ -16,12 +16,14 @@ import { getIsDraggingOrResizing } from "selectors/widgetSelectors";
 import { selectedWidgetsPresentInCanvas } from "selectors/propertyPaneSelectors";
 import WalkthroughContext from "components/featureWalkthrough/walkthroughContext";
 import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
+import { selectCombinedPreviewMode } from "selectors/gitModSelectors";
 
 export const PROPERTY_PANE_ID = "t--property-pane-sidebar";
 
 export const PropertyPaneSidebar = memo(() => {
   const sidebarRef = useRef<HTMLDivElement>(null);
   const prevSelectedWidgetId = useRef<string | undefined>();
+  const isPreviewMode = useSelector(selectCombinedPreviewMode);
 
   const selectedWidgetIds = useSelector(getSelectedWidgets);
   const isDraggingOrResizing = useSelector(getIsDraggingOrResizing);
@@ -31,6 +33,7 @@ export const PropertyPaneSidebar = memo(() => {
   //the current selected WidgetId is not equal to previous widget id,
   //then don't render PropertyPane
   const shouldNotRenderPane =
+    isPreviewMode ||
     (isDraggingOrResizing &&
       selectedWidgetIds[0] !== prevSelectedWidgetId.current) ||
     selectedWidgetIds[0] === MAIN_CONTAINER_WIDGET_ID;
diff --git a/app/client/src/pages/Editor/IDE/Layout/StaticLayout.tsx b/app/client/src/pages/Editor/IDE/Layout/StaticLayout.tsx
index 6a4bcdb31f1..f64c4a8f335 100644
--- a/app/client/src/pages/Editor/IDE/Layout/StaticLayout.tsx
+++ b/app/client/src/pages/Editor/IDE/Layout/StaticLayout.tsx
@@ -40,7 +40,6 @@ const GridContainer = styled.div`
 const LayoutContainer = styled.div<{ name: string }>`
   position: relative;
   grid-area: ${(props) => props.name};
-  overflow: auto;
 `;
 
 export const StaticLayout = React.memo(() => {