diff --git a/app/client/packages/design-system/widgets-old/src/Tooltip/index.tsx b/app/client/packages/design-system/widgets-old/src/Tooltip/index.tsx
index d5af97850b03..7ada7f1ccb04 100644
--- a/app/client/packages/design-system/widgets-old/src/Tooltip/index.tsx
+++ b/app/client/packages/design-system/widgets-old/src/Tooltip/index.tsx
@@ -75,7 +75,13 @@ if (!portalContainer) {
 function TooltipComponent(props: TooltipProps) {
   const modifiers = useMemo(
     () => ({
-      preventOverflow: { enabled: false },
+      preventOverflow: {
+        enabled: true,
+        boundariesElement: "viewport",
+      },
+      flip: {
+        enabled: true,
+      },
       ...props.modifiers,
     }),
     [props.modifiers],