diff --git a/packages/bbui/src/Tooltip/AbsTooltip.svelte b/packages/bbui/src/Tooltip/AbsTooltip.svelte
index c6963d0870..3a2c035615 100644
--- a/packages/bbui/src/Tooltip/AbsTooltip.svelte
+++ b/packages/bbui/src/Tooltip/AbsTooltip.svelte
@@ -17,6 +17,7 @@
   import Portal from "svelte-portal"
   import { fade } from "svelte/transition"
   import "@spectrum-css/tooltip/dist/index-vars.css"
+  import { onDestroy } from "svelte"
 
   export let position = TooltipPosition.Top
   export let type = TooltipType.Default
@@ -30,20 +31,21 @@
   let top = 0
   let visible = false
   let timeout
+  let interval
 
   $: {
     if (hovered || fixed) {
+      // Debounce showing by 200ms to avoid flashing tooltip
       timeout = setTimeout(show, 200)
     } else {
-      clearTimeout(timeout)
       hide()
     }
   }
   $: tooltipStyle = color ? `background:${color};` : null
   $: tipStyle = color ? `border-top-color:${color};` : null
 
-  // Computes the position of the tooltip then shows it
-  const show = () => {
+  // Computes the position of the tooltip
+  const updateTooltipPosition = () => {
     const node = wrapper?.children?.[0]
     if (!node) {
       return
@@ -63,17 +65,27 @@
     } else if (position === TooltipPosition.Left) {
       left = bounds.left
       top = bounds.top + bounds.height / 2
-    } else {
-      return
     }
+  }
 
+  // Computes the position of the tooltip then shows it.
+  // We set up a poll to frequently update the position of the tooltip in case
+  // the target moves.
+  const show = () => {
+    updateTooltipPosition()
+    interval = setInterval(updateTooltipPosition, 100)
     visible = true
   }
 
   // Hides the tooltip
   const hide = () => {
+    clearTimeout(timeout)
+    clearInterval(interval)
     visible = false
   }
+
+  // Ensure we clean up interval and timeout
+  onDestroy(hide)
 </script>
 
 <div
@@ -109,6 +121,7 @@
     pointer-events: none;
     margin: 0;
     max-width: 280px;
+    transition: top 130ms ease-out, left 130ms ease-out;
   }
   .spectrum-Tooltip-label {
     text-overflow: ellipsis;
@@ -126,7 +139,7 @@
     border-top-color: var(--spectrum-global-color-gray-500);
   }
 
-  /* Direction styles */
+  /* Position styles */
   .spectrum-Tooltip--top {
     transform: translateX(-50%) translateY(calc(-100% - 8px));
   }
diff --git a/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte b/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte
index 71bde9d3d8..f39e679da4 100644
--- a/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte
+++ b/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte
@@ -2,12 +2,7 @@
   import { getContext } from "svelte"
   import GridScrollWrapper from "./GridScrollWrapper.svelte"
   import HeaderCell from "../cells/HeaderCell.svelte"
-  import {
-    Icon,
-    TempTooltip,
-    TooltipType,
-    TooltipPosition,
-  } from "@budibase/bbui"
+  import { Icon, TempTooltip, TooltipType } from "@budibase/bbui"
 
   const {
     renderedColumns,
@@ -17,6 +12,8 @@
     width,
     config,
     hasNonAutoColumn,
+    tableId,
+    loading,
   } = getContext("grid")
 
   $: columnsWidth = $renderedColumns.reduce(
@@ -36,17 +33,15 @@
     </div>
   </GridScrollWrapper>
   {#if $config.allowSchemaChanges}
-    {#key left}
+    {#key $tableId}
       <TempTooltip
         text="Click here to create your first column"
-        position={TooltipPosition.Top}
         type={TooltipType.Info}
-        duration={3000}
-        condition={!$hasNonAutoColumn}
+        condition={!$hasNonAutoColumn && !$loading}
       >
         <div
           class="add"
-          style="left:{left}px"
+          style="left:{left}px;"
           on:click={() => dispatch("add-column")}
         >
           <Icon name="Add" />