diff --git a/src/lib/components/tabs.svelte b/src/lib/components/tabs.svelte
index fd99cef1e..e615649d3 100644
--- a/src/lib/components/tabs.svelte
+++ b/src/lib/components/tabs.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
+    import { throttle } from '$lib/helpers/functions';
+
     let showLeft = false;
     let showRight = false;
     let tabsList: HTMLUListElement;
 
-    const slide = (direction: 'left' | 'right') => {
+    function slide(direction: 'left' | 'right') {
         let scrollCompleted = 0;
         let slideVar = setInterval(() => {
             if (direction == 'left') {
@@ -16,30 +18,16 @@
                 clearInterval(slideVar);
             }
         }, 10);
-    };
+    }
 
-    //TODO: implement this directly into onScroll
-    const throttle = (fn: () => void, delay: number) => {
-        let timeout = false;
-        return () => {
-            if (!timeout) {
-                timeout = true;
-                fn.apply(this);
-                setTimeout(() => {
-                    timeout = false;
-                }, delay);
-            }
-        };
-    };
-
-    const onScroll = () => {
+    function onScroll() {
         if (!tabsList) {
             return;
         }
         const { offsetWidth, scrollLeft, scrollWidth } = tabsList;
         showLeft = scrollLeft > 10;
         showRight = scrollLeft < scrollWidth - offsetWidth - 10;
-    };
+    }
 </script>
 
 <svelte:window on:resize={throttle(onScroll, 25)} />
diff --git a/src/lib/components/trim.svelte b/src/lib/components/trim.svelte
index 0203fc694..847d696eb 100644
--- a/src/lib/components/trim.svelte
+++ b/src/lib/components/trim.svelte
@@ -1,49 +1,29 @@
 <script lang="ts">
+    import { tooltip } from '$lib/actions/tooltip';
+    import { throttle } from '$lib/helpers/functions';
     import { onMount } from 'svelte';
-    import tippy, { type PopperElement } from 'tippy.js';
 
-    let data: HTMLSpanElement & Partial<PopperElement>;
+    let showTooltip = false;
+    let container: HTMLSpanElement | null;
 
-    onMount(() => {
-        setTooltip();
-    });
+    onMount(onResize);
 
-    const setTooltip = () => {
-        if (data.innerText) {
-            const content = data.innerText;
-            let tool = data?._tippy;
-
-            if (data.offsetWidth < data.scrollWidth) {
-                if (tool) {
-                    if (!tool?.props?.content) tool.setContent(content);
-                    if (!tool.state.isEnabled) tool.enable();
-                } else {
-                    tippy(data, { content });
-                }
-            } else {
-                if (tool) {
-                    tool.disable();
-                }
-            }
-        }
-    };
-
-    const throttle = (fn: () => void, delay: number) => {
-        let timeout = false;
-        return () => {
-            if (!timeout) {
-                timeout = true;
-                fn.apply(this);
-                setTimeout(() => {
-                    timeout = false;
-                }, delay);
-            }
-        };
-    };
+    function onResize() {
+        showTooltip = container.offsetWidth < container.scrollWidth;
+    }
 </script>
 
-<svelte:window on:resize={throttle(setTooltip, 250)} />
+<svelte:window on:resize={throttle(onResize, 250)} />
 
-<span bind:this={data} class="text u-trim" title={data?.innerText}>
-    <slot />
+<span class="text u-trim" bind:this={container}>
+    {#if showTooltip}
+        <span
+            use:tooltip={{
+                content: container.innerText
+            }}>
+            <slot />
+        </span>
+    {:else}
+        <span><slot /></span>
+    {/if}
 </span>
diff --git a/src/lib/helpers/functions.ts b/src/lib/helpers/functions.ts
new file mode 100644
index 000000000..b410d3575
--- /dev/null
+++ b/src/lib/helpers/functions.ts
@@ -0,0 +1,12 @@
+export const throttle = (fn: () => void, delay: number) => {
+    let timeout = false;
+    return () => {
+        if (!timeout) {
+            timeout = true;
+            fn.apply(this);
+            setTimeout(() => {
+                timeout = false;
+            }, delay);
+        }
+    };
+};