diff --git a/src/components/ui/tooltip.tsx b/src/components/ui/tooltip.tsx
index af9c8410e..9e3e8c5ab 100644
--- a/src/components/ui/tooltip.tsx
+++ b/src/components/ui/tooltip.tsx
@@ -1,7 +1,7 @@
 import type React from "react";
 import { useEffect, useRef, useState } from "react";
 import { createPortal } from "react-dom";
-import { cn } from "../../utils/cn";
+import { cn } from "@/utils/cn";
 
 interface TooltipProps {
   content: string;
@@ -17,10 +17,15 @@ export default function Tooltip({ content, children, side = "top", className }:
   const tooltipRef = useRef<HTMLDivElement>(null);
   const timeoutRef = useRef<NodeJS.Timeout | null>(null);
 
+  const TOOLTIP_MARGIN = 8;
+
   const updatePosition = () => {
-    if (!triggerRef.current) return;
+    if (!triggerRef.current || !tooltipRef.current) return;
 
     const rect = triggerRef.current.getBoundingClientRect();
+    const tooltipRect = tooltipRef.current.getBoundingClientRect();
+    const viewportWidth = window.innerWidth;
+    const viewportHeight = window.innerHeight;
 
     let x = rect.left;
     let y = rect.top;
@@ -28,22 +33,54 @@ export default function Tooltip({ content, children, side = "top", className }:
     switch (side) {
       case "top":
         x += rect.width / 2;
-        y -= 8;
+        y -= TOOLTIP_MARGIN;
         break;
       case "bottom":
         x += rect.width / 2;
-        y += rect.height + 8;
+        y += rect.height + TOOLTIP_MARGIN;
         break;
       case "left":
-        x -= 8;
+        x -= TOOLTIP_MARGIN;
         y += rect.height / 2;
         break;
       case "right":
-        x += rect.width + 8;
+        x += rect.width + TOOLTIP_MARGIN;
         y += rect.height / 2;
         break;
     }
 
+    if (side === "top" || side === "bottom") {
+      const tooltipWidth = tooltipRect.width;
+
+      if (x - tooltipWidth / 2 < TOOLTIP_MARGIN) {
+        x = tooltipWidth / 2 + TOOLTIP_MARGIN;
+      } else if (x + tooltipWidth / 2 > viewportWidth - TOOLTIP_MARGIN) {
+        x = viewportWidth - tooltipWidth / 2 - TOOLTIP_MARGIN;
+      }
+
+      const tooltipHeight = tooltipRect.height;
+      if (side === "top" && y - tooltipHeight < TOOLTIP_MARGIN) {
+        y = rect.bottom + TOOLTIP_MARGIN;
+      } else if (side === "bottom" && y + tooltipHeight > viewportHeight - TOOLTIP_MARGIN) {
+        y = rect.top - TOOLTIP_MARGIN;
+      }
+    } else {
+      const tooltipWidth = tooltipRect.width;
+      const tooltipHeight = tooltipRect.height;
+
+      if (y - tooltipHeight / 2 < TOOLTIP_MARGIN) {
+        y = tooltipHeight / 2 + TOOLTIP_MARGIN;
+      } else if (y + tooltipHeight / 2 > viewportHeight - TOOLTIP_MARGIN) {
+        y = viewportHeight - tooltipHeight / 2 - TOOLTIP_MARGIN;
+      }
+
+      if (side === "left" && x - tooltipWidth < TOOLTIP_MARGIN) {
+        x = rect.right + TOOLTIP_MARGIN;
+      } else if (side === "right" && x + tooltipWidth > viewportWidth - TOOLTIP_MARGIN) {
+        x = rect.left - TOOLTIP_MARGIN;
+      }
+    }
+
     setPosition({ x, y });
   };