diff --git a/public/akaunting-js/generalAction.js b/public/akaunting-js/generalAction.js
index 48ec55ebd..337834b27 100644
--- a/public/akaunting-js/generalAction.js
+++ b/public/akaunting-js/generalAction.js
@@ -360,16 +360,14 @@ if (navigator.userAgent.search("Firefox") >= 0) {
 
 //margue animation for truncated text
 document.querySelectorAll('[data-truncate]').forEach((truncate) => {
-    let truncateText = truncate.innerText.split(" ").join("");
-
     if (truncate.offsetWidth > truncate.parentElement.clientWidth || truncate.offsetWidth > truncate.parentElement.parentElement.clientWidth) {        
         truncate.addEventListener('mouseover', function () {
             truncate.parentElement.style.animationPlayState = 'running';
             truncate.parentElement.classList.add('animate-marquee');
     
-            // if (truncate.parentElement.classList.contains('truncate')) {
-            //     truncate.parentElement.classList.remove('truncate');
-            // }
+            if (truncate.parentElement.classList.contains('truncate')) {
+                truncate.parentElement.classList.remove('truncate');
+            }
         });
     
         truncate.addEventListener('mouseout', function () {
diff --git a/resources/views/common/items/index.blade.php b/resources/views/common/items/index.blade.php
index 65500b26e..f4cf11ea8 100644
--- a/resources/views/common/items/index.blade.php
+++ b/resources/views/common/items/index.blade.php
@@ -91,7 +91,7 @@
                                             <x-index.disable text="{{ trans_choice('general.items', 1) }}" />
                                         @endif
                                     </x-slot>
-                                    <x-slot name="second" class="font-normal truncate" override="class">
+                                    <x-slot name="second" class="font-normal" override="class">
                                         {{ $item->description }}
                                     </x-slot>
                                 </x-table.td>
diff --git a/resources/views/components/table/td.blade.php b/resources/views/components/table/td.blade.php
index 30c299253..cef211941 100644
--- a/resources/views/components/table/td.blade.php
+++ b/resources/views/components/table/td.blade.php
@@ -1,4 +1,4 @@
-<td class="{{ $class }}" {{ $attributes }}>
+<td data-truncate-table class="{{ $class }}" {{ $attributes }}>
     @if (!empty($first))
     @php
         $first_attributes = $first->attributes;
@@ -32,7 +32,7 @@
         </div>
     </div>
     @endif
-    
+
     <div>
         <span data-truncate>
             {{ $slot }}
diff --git a/resources/views/components/table/th.blade.php b/resources/views/components/table/th.blade.php
index e3d79db3f..100e2e467 100644
--- a/resources/views/components/table/th.blade.php
+++ b/resources/views/components/table/th.blade.php
@@ -8,7 +8,11 @@
         }
     @endphp
     <div {{ $first_attributes }}>
-        {!! $first !!}
+        <div>
+            <span data-truncate>
+                {!! $first !!}
+            </span>
+        </div>
     </div>
     @endif
 
@@ -21,9 +25,17 @@
         }
     @endphp
     <div {{ $second_attributes }}>
-        {!! $second !!}
+        <div>
+            <span data-truncate>
+                {!! $second !!}
+            </span>
+        </div>
     </div>
     @endif
 
-    {{ $slot }}
+    <div>
+        <span data-truncate>
+            {{ $slot }}
+        </span>
+    </div>
 </th>