diff --git a/VDS/Classes/Control.swift b/VDS/Classes/Control.swift
index d5af7f46..ba2acd42 100644
--- a/VDS/Classes/Control.swift
+++ b/VDS/Classes/Control.swift
@@ -29,10 +29,12 @@ open class Control: UIControl, Handlerable, ViewProtocol, Resettable {
         
     open override var isSelected: Bool { didSet { didChange() } }
     
+    internal var enabledHighlight: Bool = true
+    
     var isHighlightAnimating = false
     open override var isHighlighted: Bool {
         didSet {
-            if isHighlightAnimating == false {
+            if isHighlightAnimating == false && enabledHighlight {
                 isHighlightAnimating = true
                 UIView.animate(withDuration: 0.1, animations: { [weak self] in
                     self?.updateView()
diff --git a/VDS/Components/TextFields/EntryField/EntryField.swift b/VDS/Components/TextFields/EntryField/EntryField.swift
index d38d4453..9687efa9 100644
--- a/VDS/Components/TextFields/EntryField/EntryField.swift
+++ b/VDS/Components/TextFields/EntryField/EntryField.swift
@@ -163,6 +163,7 @@ open class EntryField: Control, Accessable {
     open override func setup() {
         super.setup()
                 
+        enabledHighlight = false 
         isAccessibilityElement = true
         accessibilityTraits = .button
         addSubview(stackView)