diff --git a/packages/excalidraw/components/PropertiesPopover.tsx b/packages/excalidraw/components/PropertiesPopover.tsx
index 3c03c35b99..caa0650d63 100644
--- a/packages/excalidraw/components/PropertiesPopover.tsx
+++ b/packages/excalidraw/components/PropertiesPopover.tsx
@@ -59,6 +59,8 @@ export const PropertiesPopover = React.forwardRef<
           }
           alignOffset={-16}
           sideOffset={20}
+          collisionBoundary={container ?? undefined}
+          collisionPadding={8}
           style={{
             zIndex: "var(--zIndex-ui-styles-popup)",
             marginLeft: device.editor.isMobile ? "0.5rem" : undefined,