diff --git a/src/components/WindowsViewport.tsx b/src/components/WindowsViewport.tsx
index 2092bf30..c899f803 100644
--- a/src/components/WindowsViewport.tsx
+++ b/src/components/WindowsViewport.tsx
@@ -28,7 +28,7 @@ export function WindowsViewport({ children }: PropsWithChildren<unknown>): JSX.E
 
   const { zIndex } = useTheme();
   return (
-    <div className={cx(fullscreenFixed, ignorePointerEvents, css({ zIndex }))} ref={observe}>
+    <div id={"windowsViewport"} className={cx(fullscreenFixed, ignorePointerEvents, css({ zIndex }))} ref={observe}>
       <ViewportContext.Provider value={value}>{children}</ViewportContext.Provider>
     </div>
   );
diff --git a/src/components/window/WindowFrame.tsx b/src/components/window/WindowFrame.tsx
index 07f88623..a1e3a005 100644
--- a/src/components/window/WindowFrame.tsx
+++ b/src/components/window/WindowFrame.tsx
@@ -277,7 +277,7 @@ export const WindowFrame = forwardRef((props: PropsWithChildren<WindowFrameProps
   useScrollFix(ref.current);
 
   return (
-    <div ref={windowRef} style={{ height: "100%" }}>
+    <div ref={windowRef}>
       {/*fallback animation for lazy loaded content*/}
       <CSSTransition nodeRef={ref} in={contentAvailable} timeout={250} classNames={fadeInAnimation}>
         <CSSTransition in={maximized} timeout={250} classNames={zoomAnimation} onEnter={onEnter} onExited={onExited}>
@@ -286,7 +286,7 @@ export const WindowFrame = forwardRef((props: PropsWithChildren<WindowFrameProps
             enableResizing={resizable && !maximized}
             className={cx(windowClass, windowTheme)}
             style={{ display: "flex", zIndex }} // override default inline-block
-            bounds="parent"
+            bounds="#windowsViewport"
             size={size}
             position={maximized ? { x: 0, y: 0 } : position}
             minWidth={currentMinWidth}