diff --git a/VDS/Components/DatePicker/DatePicker.swift b/VDS/Components/DatePicker/DatePicker.swift
index df7cc7c9..d65465b7 100644
--- a/VDS/Components/DatePicker/DatePicker.swift
+++ b/VDS/Components/DatePicker/DatePicker.swift
@@ -154,15 +154,12 @@ open class DatePicker: EntryFieldBase {
         selectedDateLabel.textColorConfiguration = primaryColorConfiguration.eraseToAnyColorable()
         
         // tap gesture
-        containerView
-            .publisher(for: UITapGestureRecognizer())
-            .sink { [weak self] _ in
-                guard let self else { return }
-                if isEnabled && !isReadOnly {
-                    showPopover()
-                }
+        containerView.onClick = { [weak self] _ in
+            guard let self else { return }
+            if isEnabled && !isReadOnly {
+                showPopover()
             }
-            .store(in: &subscribers)
+        }
         
         NotificationCenter.default
             .publisher(for: UIDevice.orientationDidChangeNotification).sink {  [weak self] _ in
diff --git a/VDS/Components/DropdownSelect/DropdownSelect.swift b/VDS/Components/DropdownSelect/DropdownSelect.swift
index 947210f4..f0dc8084 100644
--- a/VDS/Components/DropdownSelect/DropdownSelect.swift
+++ b/VDS/Components/DropdownSelect/DropdownSelect.swift
@@ -153,12 +153,9 @@ open class DropdownSelect: EntryFieldBase {
         }()
         
         // tap gesture
-        containerView
-            .publisher(for: UITapGestureRecognizer())
-            .sink { [weak self] _ in
-                self?.launchPicker()
-            }
-            .store(in: &subscribers)
+        containerView.onClick = { [weak self] _ in
+            self?.launchPicker()
+        }
         containerView.height(44)
     }