diff --git a/VDS/Components/Buttons/ButtonBase.swift b/VDS/Components/Buttons/ButtonBase.swift
index 64dbea7e..879588d1 100644
--- a/VDS/Components/Buttons/ButtonBase.swift
+++ b/VDS/Components/Buttons/ButtonBase.swift
@@ -81,7 +81,7 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable {
     public var isHighlighting = false
     
     /// Whether the Button should handle the isHighlighted state.
-    open var shouldHighlight: Bool { isHighlighting == false && onClickSubscriber != nil }
+    open var shouldHighlight: Bool { isHighlighting == false }
     
     /// Whether the Control is highlighted or not.
     open override var isHighlighted: Bool {
@@ -116,6 +116,7 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable {
         
         titleLabel?.adjustsFontSizeToFitWidth = false
         titleLabel?.lineBreakMode = .byTruncatingTail
+        titleLabel?.numberOfLines = 1
     }
     
     open func updateView() {