diff --git a/packages/bbui/src/Tooltip/Context.svelte b/packages/bbui/src/Tooltip/Context.svelte
index 59747f83ed..a79b7d369d 100644
--- a/packages/bbui/src/Tooltip/Context.svelte
+++ b/packages/bbui/src/Tooltip/Context.svelte
@@ -48,9 +48,10 @@
       const fadeOut = [{ opacity: "1" }, { opacity: "0" }];
 
       const fadeTiming = {
-        duration: 300,
+        duration: 200,
         iterations: 1,
-        easing: "ease-in"
+        easing: "ease-in",
+        fill: "forwards"
       };
 
       currentTooltip.animate(fadeIn, fadeTiming);
@@ -60,6 +61,8 @@
       if (initialShow) {
         initialShow = false;
 
+        previousTooltip.style.visibility = "hidden"
+
         wrapper.style.transition = "none";
         wrapper.style.width = `${currentTooltipWidth}px`
         wrapper.style.height = `${currentTooltipHeight}px`
@@ -74,6 +77,8 @@
           wrapper.style.removeProperty("transition");
           resetWrapper.style.removeProperty("transition");
         })
+      } else {
+        previousTooltip.style.removeProperty("visibility");
       }
     })
   }