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 b8e094507f..e7d4c6379c 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,4 @@
-<div class="{{field.className}}"
-     id="data-time-widget" [class.adf-invalid]="!field.isValid" cdkTrapFocus>
+<div class="{{field.className}}" id="data-time-widget" [class.adf-invalid]="!field.isValid">
     <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 098c2f223a..439a626915 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" cdkTrapFocus>
+<div class="{{field.className}}" id="data-widget" [class.adf-invalid]="!field.isValid">
     <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
diff --git a/package-lock.json b/package-lock.json
index bb5b9b739c..3ebfdec3ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2796,17 +2796,17 @@
       }
     },
     "@mat-datetimepicker/core": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@mat-datetimepicker/core/-/core-5.0.1.tgz",
-      "integrity": "sha512-jZyImHMGDSkCuOVI4rC4lvTtnSroicrsaPpWX2R07gS5oI47/ATuYsoQu4/tmRG6dt4FbXD3+BrWl5Uqs0/6Hw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@mat-datetimepicker/core/-/core-5.1.1.tgz",
+      "integrity": "sha512-xWadXWYfIeO0JiT94Z+aEPZrRleZB422MuVSH+A8SbhnPKkEwzDAebik7W43m1Rdbz435TIdyODM9bzQPCnMXA==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@mat-datetimepicker/moment": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@mat-datetimepicker/moment/-/moment-5.0.1.tgz",
-      "integrity": "sha512-U9eWh+CS2NTw/3DMlxBi9h93JtD0KwrVYCiXyJu2q7VxS7Je/I+TS5PIh4K64vZ1NFNI5o6hW4qEwM7uURmrKw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@mat-datetimepicker/moment/-/moment-5.1.1.tgz",
+      "integrity": "sha512-cH4Qv1qeype+qdASy8pLGmXNILaVXVpVxEYIRaIyl9RSOp3AVGzlU0YxnbXAA5PiY8i+yj+ZlWrFxnRuVBZ47Q==",
       "requires": {
         "tslib": "^2.0.0"
       }
diff --git a/package.json b/package.json
index 7a77485a7e..b158f6bb8f 100644
--- a/package.json
+++ b/package.json
@@ -84,8 +84,8 @@
     "@angular/platform-browser": "^10.0.4",
     "@angular/platform-browser-dynamic": "^10.0.4",
     "@angular/router": "^10.0.4",
-    "@mat-datetimepicker/core": "^5.0.1",
-    "@mat-datetimepicker/moment": "^5.0.1",
+    "@mat-datetimepicker/core": "^5.1.1",
+    "@mat-datetimepicker/moment": "^5.1.1",
     "@ngx-translate/core": "^13.0.0",
     "adf-tslint-rules": "0.0.7",
     "chart.js": "2.9.4",