diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input3_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input3_Spec.ts
index 18d754517aa4..d5d7bbc7d45c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input3_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Input/Input3_Spec.ts
@@ -104,6 +104,7 @@ describe(
       );
       agHelper.HoverElement(locators._tooltipIcon);
       agHelper.AssertPopoverTooltip("Input tooltip");
+      agHelper.AssertCSS(locators._tooltipIcon, "overflow", "hidden");
       agHelper.ClearNType(
         locators._widgetInDeployed(draggableWidgets.INPUT_V2) + " textarea",
         "test",
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 8555bc1cb1e5..912156e5cf5d 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
@@ -76,7 +76,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],