diff --git a/libs/components/ui/src/model/index.tsx b/libs/components/ui/src/model/index.tsx
index baeb5db9ac..85041a5145 100644
--- a/libs/components/ui/src/model/index.tsx
+++ b/libs/components/ui/src/model/index.tsx
@@ -32,11 +32,13 @@ export const TransitionsModal = (props: TransitionsModalProps) => {
             onClose={props.onClose}
             closeAfterTransition
         >
-            <MuiClickAwayListener onClickAway={props.onClose}>
-                <Fade in={props.open} timeout={300}>
-                    {props.children}
-                </Fade>
-            </MuiClickAwayListener>
+            <div>
+                <MuiClickAwayListener onClickAway={props.onClose}>
+                    <Fade in={props.open} timeout={300}>
+                        {props.children}
+                    </Fade>
+                </MuiClickAwayListener>
+            </div>
         </Modal>
     );
 };
diff --git a/libs/components/ui/src/popover/Popover.tsx b/libs/components/ui/src/popover/Popover.tsx
index ec919811dc..2639afce36 100644
--- a/libs/components/ui/src/popover/Popover.tsx
+++ b/libs/components/ui/src/popover/Popover.tsx
@@ -25,8 +25,11 @@ export const placementToContainerDirection: Record<
     'auto-end': 'none',
 };
 
-export const Popover = (props: PropsWithChildren<PopoverProps>) => {
-    const { popoverDirection, placement, content, children, style } = props;
+export const Popover = ({
+    popoverDirection,
+    ...props
+}: PropsWithChildren<PopoverProps>) => {
+    const { placement, content, children, style } = props;
     return (
         <Popper
             {...props}