diff --git a/lib/core/form/components/widgets/date-time/date-time.widget.html b/lib/core/form/components/widgets/date-time/date-time.widget.html
index acc346b35e..5ff226c3a7 100644
--- a/lib/core/form/components/widgets/date-time/date-time.widget.html
+++ b/lib/core/form/components/widgets/date-time/date-time.widget.html
@@ -1,5 +1,5 @@
 <div class="{{field.className}}"
-     id="data-time-widget" [class.adf-invalid]="!field.isValid">
+     id="data-time-widget" [class.adf-invalid]="!field.isValid" cdkTrapFocus>
     <mat-form-field class="adf-date-time-widget">
         <label class="adf-label" [attr.for]="field.id">{{field.name | translate }} ({{field.dateDisplayFormat}})<span *ngIf="isRequired()">*</span></label>
         <input matInput
diff --git a/lib/core/form/components/widgets/date/date.widget.html b/lib/core/form/components/widgets/date/date.widget.html
index 0ab8b23597..ec1647266b 100644
--- a/lib/core/form/components/widgets/date/date.widget.html
+++ b/lib/core/form/components/widgets/date/date.widget.html
@@ -1,4 +1,4 @@
-<div class="{{field.className}}" id="data-widget" [class.adf-invalid]="!field.isValid">
+<div class="{{field.className}}" id="data-widget" [class.adf-invalid]="!field.isValid" cdkTrapFocus>
     <mat-form-field class="adf-date-widget">
         <label class="adf-label" [attr.for]="field.id">{{field.name | translate }} ({{field.dateDisplayFormat}})<span *ngIf="isRequired()">*</span></label>
         <input matInput
@@ -18,4 +18,3 @@
     <error-widget *ngIf="isInvalidFieldRequired()" required="{{ 'FORM.FIELD.REQUIRED' | translate }}"></error-widget>
     <mat-datepicker #datePicker [touchUi]="true" [startAt]="displayDate" ></mat-datepicker>
 </div>
-