diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 1354abdc3f..6e31a28471 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -438,7 +438,9 @@ module ApplicationHelper
     # Ensure global AV context exists (when, e.g., called from widget)
     @_request ||= request
     include_calendar_headers_tags
-    nonced_javascript_tag("jQuery(function() { jQuery('##{field_id}').datepicker(); })")
+    nonced_javascript_tag <<-EOS
+      jQuery(function() { jQuery('##{field_id}').attr('autocomplete', 'off').datepicker(); });
+    EOS
   end
 
   def include_calendar_headers_tags
diff --git a/frontend/src/app/modules/common/op-date-picker/datepicker.ts b/frontend/src/app/modules/common/op-date-picker/datepicker.ts
index b979472eb0..dbd9f16da8 100644
--- a/frontend/src/app/modules/common/op-date-picker/datepicker.ts
+++ b/frontend/src/app/modules/common/op-date-picker/datepicker.ts
@@ -58,6 +58,9 @@ export class DatePicker {
     });
 
     this.datepickerInstance = this.datepickerCont.datepicker(mergedOptions);
+
+    // Disable autocomplete to avoid overlay
+    this.datepickerCont.attr('autocomplete', 'off');
   }
 
   public clear() {