diff --git a/VDS/Components/Buttons/ButtonBase.swift b/VDS/Components/Buttons/ButtonBase.swift
index e8a379d9..46f72c55 100644
--- a/VDS/Components/Buttons/ButtonBase.swift
+++ b/VDS/Components/Buttons/ButtonBase.swift
@@ -146,7 +146,8 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable {
     // MARK: - Private Methods
     //--------------------------------------------------
     private func updateLabel() {
-       
+        defer { invalidateIntrinsicContentSize() }
+        
         //clear the arrays holding actions
         accessibilityCustomActions = []
         if let text, !text.isEmpty {
diff --git a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
index f02d2b10..df276354 100644
--- a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
+++ b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
@@ -106,12 +106,20 @@ open class TextLinkCaret: ButtonBase {
     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))
+        let labelSize = titleLabel.sizeThatFits(CGSize(width: self.frame.width - (contentEdgeInsets.left + contentEdgeInsets.right), 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
     }
+    
+    open override func layoutSubviews() {
+        super.layoutSubviews()
+        // This ensures the titleLabel is correctly positioned within the button
+        titleLabel?.preferredMaxLayoutWidth = self.frame.width - (contentEdgeInsets.left + contentEdgeInsets.right)
+        super.layoutSubviews() // Calling super again to ensure layout is updated with preferredMaxLayoutWidth
+    }
+
 }
 
 extension TextLinkCaret {