diff --git a/lib/core/form/components/widgets/date-time/date-time.widget.scss b/lib/core/form/components/widgets/date-time/date-time.widget.scss
index eb0e252e1f..24e6e3cc53 100644
--- a/lib/core/form/components/widgets/date-time/date-time.widget.scss
+++ b/lib/core/form/components/widgets/date-time/date-time.widget.scss
@@ -18,6 +18,7 @@
         &-date-widget {
             .mat-form-field-suffix {
                 position: relative;
+                width: auto;
             }
         }
     }
diff --git a/lib/core/form/components/widgets/date/date.widget.scss b/lib/core/form/components/widgets/date/date.widget.scss
index 8c68d433b1..48a4b54045 100644
--- a/lib/core/form/components/widgets/date/date.widget.scss
+++ b/lib/core/form/components/widgets/date/date.widget.scss
@@ -36,6 +36,7 @@
         &-date-widget {
             .mat-form-field-suffix {
                 position: relative;
+                width: auto;
             }
         }
     }
diff --git a/lib/process-services/task-list/components/start-task.component.scss b/lib/process-services/task-list/components/start-task.component.scss
index c62a5ea745..635f1aa4e5 100644
--- a/lib/process-services/task-list/components/start-task.component.scss
+++ b/lib/process-services/task-list/components/start-task.component.scss
@@ -62,18 +62,6 @@
         padding-top: 0;
     }
 
-    #people-widget-content {
-        .mat-form-field {
-            width: 100%;
-        }
-        .adf-label {
-            line-height: 0;
-        }
-        .adf-error-text-container {
-            margin-top: -10px;
-        }
-    }
-
     adf-start-task {
 
         people-widget {
@@ -83,6 +71,18 @@
             }
         }
 
+        #people-widget-content {
+            .mat-form-field {
+                width: 100%;
+            }
+            .adf-label {
+                line-height: 0;
+            }
+            .adf-error-text-container {
+                margin-top: -10px;
+            }
+        }
+
         .adf {
 
             &-new-task-footer {