diff --git a/VDS/Components/DropdownSelect/DropdownSelect.swift b/VDS/Components/DropdownSelect/DropdownSelect.swift
index 944171f1..e2217f04 100644
--- a/VDS/Components/DropdownSelect/DropdownSelect.swift
+++ b/VDS/Components/DropdownSelect/DropdownSelect.swift
@@ -171,10 +171,9 @@ open class DropdownSelect: EntryFieldBase {
         }()
         
         // tap gesture
-        fieldStackView
+        containerView
             .publisher(for: UITapGestureRecognizer())
             .sink { [weak self] _ in
-                print("touch occured")
                 self?.launchPicker()
             }
             .store(in: &subscribers)
@@ -349,16 +348,6 @@ open class DropdownSelect: EntryFieldBase {
         titleLabelWidthConstraint?.constant = containerView.frame.width
         titleLabelWidthConstraint?.isActive = helperTextPlacement == .right
     }
-    
-    open override var canBecomeFirstResponder: Bool { true }
-
-    open override func resignFirstResponder() -> Bool {
-        print("resign occurred")
-        if dropdownField.isFirstResponder {
-            dropdownField.resignFirstResponder()
-        }
-        return super.resignFirstResponder()
-    }
 }
 
 //--------------------------------------------------
@@ -374,6 +363,7 @@ extension DropdownSelect: UIPickerViewDelegate, UIPickerViewDataSource {
             dropdownField.resignFirstResponder()
         }
         optionsPicker.isHidden = !optionsPicker.isHidden
+        updateContainerView()
     }
     
     public func numberOfComponents(in pickerView: UIPickerView) -> Int {
diff --git a/VDS/Components/TextFields/EntryFieldBase.swift b/VDS/Components/TextFields/EntryFieldBase.swift
index c7cd766c..f766fafd 100644
--- a/VDS/Components/TextFields/EntryFieldBase.swift
+++ b/VDS/Components/TextFields/EntryFieldBase.swift
@@ -307,7 +307,7 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
     //--------------------------------------------------
     // MARK: - Private Methods
     //--------------------------------------------------
-    private func updateContainerView()  {
+    internal func updateContainerView()  {
         containerView.backgroundColor = backgroundColorConfiguration.getColor(self)
         containerView.layer.borderColor = isReadOnly ? readOnlyBorderColorConfiguration.getColor(self).cgColor : borderColorConfiguration.getColor(self).cgColor
         containerView.layer.borderWidth = VDSFormControls.borderWidth
diff --git a/VDS/Components/TextFields/InputField/InputField.swift b/VDS/Components/TextFields/InputField/InputField.swift
index 1886a9ab..fbb57f2b 100644
--- a/VDS/Components/TextFields/InputField/InputField.swift
+++ b/VDS/Components/TextFields/InputField/InputField.swift
@@ -323,21 +323,12 @@ open class InputField: EntryFieldBase {
         titleLabelWidthConstraint?.constant = containerView.frame.width
         titleLabelWidthConstraint?.isActive = helperTextPlacement == .right
     }
-
-    open override var canBecomeFirstResponder: Bool { true }
-
-    open override func resignFirstResponder() -> Bool {
-        if textField.isFirstResponder {
-            textField.resignFirstResponder()
-        }
-        return super.resignFirstResponder()
-    }
 }
 
 extension InputField: UITextFieldDelegate {
     public func textFieldDidBeginEditing(_ textField: UITextField) {
         fieldType.handler().textFieldDidBeginEditing(self, textField: textField)
-        setNeedsUpdate()
+        updateContainerView()
     }
     
     public func textFieldDidEndEditing(_ textField: UITextField) {
@@ -349,8 +340,6 @@ extension InputField: UITextFieldDelegate {
         fieldType.handler().textFieldDidChangeSelection(self, textField: textField)
         if fieldType.handler().validateOnChange {
             validate()
-        } else {
-            setNeedsUpdate()
         }
         sendActions(for: .valueChanged)
     }