diff --git a/VDS/Components/Buttons/TextLink/TextLink.swift b/VDS/Components/Buttons/TextLink/TextLink.swift
index 1b1f79e8..51221b34 100644
--- a/VDS/Components/Buttons/TextLink/TextLink.swift
+++ b/VDS/Components/Buttons/TextLink/TextLink.swift
@@ -75,7 +75,13 @@ open class TextLink: ButtonBase {
             
     /// The natural size for the receiving view, considering only properties of the view itself.
     open override var intrinsicContentSize: CGSize {
-        return titleLabel?.intrinsicContentSize ?? super.intrinsicContentSize
+        guard let titleLabel else { return super.intrinsicContentSize }
+        // Calculate the titleLabel's intrinsic content size
+        let labelSize = titleLabel.sizeThatFits(CGSize(width: self.frame.width, height: CGFloat.greatestFiniteMagnitude))
+        // Adjust the size if needed (add any additional padding if your design requires)
+        let adjustedSize = CGSize(width: labelSize.width + contentEdgeInsets.left + contentEdgeInsets.right,
+                                  height: labelSize.height + contentEdgeInsets.top + contentEdgeInsets.bottom)
+        return adjustedSize
     }
     
     //--------------------------------------------------
diff --git a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
index eb3776ea..f02d2b10 100644
--- a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
+++ b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
@@ -103,9 +103,14 @@ open class TextLinkCaret: ButtonBase {
     }
     
     /// The natural size for the receiving view, considering only properties of the view itself.
-    override open var intrinsicContentSize: CGSize {
-        //get the labels size, if not the button
-        return titleLabel?.intrinsicContentSize ?? super.intrinsicContentSize
+    open override var intrinsicContentSize: CGSize {
+        guard let titleLabel else { return super.intrinsicContentSize }
+        // Calculate the titleLabel's intrinsic content size
+        let labelSize = titleLabel.sizeThatFits(CGSize(width: self.frame.width, height: CGFloat.greatestFiniteMagnitude))
+        // Adjust the size if needed (add any additional padding if your design requires)
+        let adjustedSize = CGSize(width: labelSize.width + contentEdgeInsets.left + contentEdgeInsets.right,
+                                  height: labelSize.height + contentEdgeInsets.top + contentEdgeInsets.bottom)
+        return adjustedSize
     }
 }