diff --git a/CHANGELOG.md b/CHANGELOG.md
index 621c04a..b76aae8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 7.5.20
+- Fixed `ThemedTable2` header overflow detection by including the sort icon width in the available text width, ensuring tooltips appear correctly.
+
 ## 7.5.19
 - Add `ThemedTooltip` to headers of `ThemedTable2` for better overflow handling
 
diff --git a/lib/src/table2/src/table.dart b/lib/src/table2/src/table.dart
index fa396f9..4472202 100644
--- a/lib/src/table2/src/table.dart
+++ b/lib/src/table2/src/table.dart
@@ -483,7 +483,10 @@ class _ThemedTable2State<T> extends State<ThemedTable2<T>> {
                                           alignment: entry.alignment,
                                           child: Builder(
                                             builder: (context) {
-                                              final double textWidth = cellWidth - (_padding.left + _padding.right);
+                                              final double textWidth =
+                                                  cellWidth -
+                                                  (_padding.left + _padding.right) -
+                                                  (isSelected ? _sortIconSize : 0);
 
                                               // Fetch inline spans if richTextBuilder is provided, otherwise, use the header text
                                               final textOnlySpan = TextSpan(
diff --git a/pubspec.yaml b/pubspec.yaml
index cd6ef2f..ec33cda 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: layrz_theme
 description: Layrz standard styling library for Flutter. Widget library following the Material Design 3 guidelines, with a focus on reliavility and functionality.
-version: "7.5.19"
+version: "7.5.20"
 homepage: https://theme.layrz.com
 repository: https://github.com/goldenm-software/layrz_theme