diff --git a/packages/nc-gui/components/dashboard/TreeView.vue b/packages/nc-gui/components/dashboard/TreeView.vue
index 26c9bf60c1..aa700dea57 100644
--- a/packages/nc-gui/components/dashboard/TreeView.vue
+++ b/packages/nc-gui/components/dashboard/TreeView.vue
@@ -323,7 +323,7 @@ function openTableCreateDialog() {
                 :data-id="table.id"
                 @click="addTableTab(table)"
               >
-                <GeneralTooltip wrapper-class="pl-5 pr-3 py-2" modifier-key="Alt">
+                <GeneralTooltip class="pl-5 pr-3 py-2" modifier-key="Alt">
                   <template #title>{{ table.table_name }}</template>
                   <div class="flex items-center gap-2 h-full" @contextmenu="setMenuContext('table', table)">
                     <div class="flex w-auto">
diff --git a/packages/nc-gui/components/general/Tooltip.vue b/packages/nc-gui/components/general/Tooltip.vue
index 57efc34135..c3d4ccc1a3 100644
--- a/packages/nc-gui/components/general/Tooltip.vue
+++ b/packages/nc-gui/components/general/Tooltip.vue
@@ -1,46 +1,79 @@
 <script lang="ts" setup>
 import { onKeyStroke } from '@vueuse/core'
-import { ref, watch } from '#imports'
+import type { CSSProperties } from '@vue/runtime-dom'
+import { ref, useElementHover, watch } from '#imports'
 
 interface Props {
   // Key to be pressed on hover to trigger the tooltip
   modifierKey?: string
-  wrapperClass?: string
+  tooltipStyle?: CSSProperties
 }
 
-const { modifierKey, wrapperClass } = defineProps<Props>()
+const { modifierKey, tooltipStyle } = defineProps<Props>()
+
+const el = ref()
 
 const showTooltip = ref(false)
 
-const isMouseOver = ref(false)
+const isHovering = useElementHover(() => el.value)
+
+const isKeyPressed = ref(false)
 
-if (modifierKey) {
-  onKeyStroke(modifierKey, (e) => {
+onKeyStroke(
+  (e) => e.key === modifierKey,
+  (e) => {
     e.preventDefault()
-    if (modifierKey && isMouseOver.value) {
+    if (modifierKey && isHovering.value) {
       showTooltip.value = true
     }
-  })
-}
 
-watch(isMouseOver, (val) => {
-  if (!val) {
+    isKeyPressed.value = true
+  },
+  { eventName: 'keydown' },
+)
+
+onKeyStroke(
+  (e) => e.key === modifierKey,
+  (e) => {
+    e.preventDefault()
+    if (modifierKey) {
+      showTooltip.value = false
+    }
+
+    isKeyPressed.value = false
+  },
+  { eventName: 'keyup' },
+)
+
+watch([isHovering, () => modifierKey], ([hovering, key]) => {
+  if (!hovering) {
     showTooltip.value = false
   }
 
   // Show tooltip on mouseover if no modifier key is provided
-  if (val && !modifierKey) {
+  if (hovering && !key) {
+    showTooltip.value = true
+  }
+
+  // While hovering if the modifier key was changed and the key is not pressed, hide tooltip
+  if (hovering && key && !isKeyPressed.value) {
+    showTooltip.value = false
+  }
+
+  // When mouse leaves the element, then re-enters the element while key stays pressed, show the tooltip
+  if (!showTooltip.value && hovering && key && isKeyPressed.value) {
     showTooltip.value = true
   }
 })
 </script>
 
 <template>
-  <a-tooltip v-model:visible="showTooltip" :trigger="[]">
+  <a-tooltip v-model:visible="showTooltip" :overlay-style="tooltipStyle" :trigger="[]">
     <template #title>
       <slot name="title" />
     </template>
-    <div class="w-full" :class="wrapperClass" @mouseenter="isMouseOver = true" @mouseleave="isMouseOver = false">
+
+    <div ref="el" class="w-full" :class="$attrs.class" :style="$attrs.style">
       <slot />
     </div>
   </a-tooltip>