diff --git a/VDS/Components/DatePicker/DatePicker.swift b/VDS/Components/DatePicker/DatePicker.swift
index cd4b3777..96919781 100644
--- a/VDS/Components/DatePicker/DatePicker.swift
+++ b/VDS/Components/DatePicker/DatePicker.swift
@@ -100,13 +100,14 @@ open class DatePicker: EntryFieldBase, DatePickerPopoverViewControllerDelegate,
         // setting color config
         selectedDateLabel.textColorConfiguration = primaryColorConfiguration.eraseToAnyColorable()
               
-        // setup the calendar
-        
         // tap gesture
         fieldStackView
             .publisher(for: UITapGestureRecognizer())
             .sink { [weak self] _ in
-                self?.togglePicker()
+                guard let self else { return }
+                if self.isEnabled && !self.isReadOnly {
+                    self.togglePicker()
+                }
             }
             .store(in: &subscribers)
     }