diff --git a/alfa-client/apps/alfa/src/styles/material/_formfield.scss b/alfa-client/apps/alfa/src/styles/material/_formfield.scss
index ee22634bf4708e844d492ed772bf7ac35be8f99a..db836eea094400abbbe71118698dbc737c28ba07 100644
--- a/alfa-client/apps/alfa/src/styles/material/_formfield.scss
+++ b/alfa-client/apps/alfa/src/styles/material/_formfield.scss
@@ -58,3 +58,14 @@ body.dark {
     --mdc-filled-text-field-disabled-active-indicator-color: theme('colors.error');
   }
 }
+.mat-mdc-form-field {
+  @apply w-full self-start;
+
+  .mat-mdc-form-field-subscript-wrapper {
+    @apply flex;
+
+    .mat-mdc-form-field-error-wrapper {
+      @apply static;
+    }
+  }
+}
diff --git a/alfa-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.html b/alfa-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.html
index 3a5337cbab58d332a3c3e4e8d500db3f33bd1d2d..1693131b734e3e3b740e4e5cfdd5dc8d516a0766 100644
--- a/alfa-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.html
+++ b/alfa-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.html
@@ -23,7 +23,7 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<mat-form-field class="max-w-48">
+<mat-form-field class="max-w-56">
   <mat-label>{{ label }}</mat-label>
   <input
     matInput
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-form/wiedervorlage-form.component.scss b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-form/wiedervorlage-form.component.scss
index 06bdf88ffc6b638f9e6617ed208053251ee08532..d2205382450a138638da8c18b03a5224fe2248ff 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-form/wiedervorlage-form.component.scss
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-form/wiedervorlage-form.component.scss
@@ -26,10 +26,6 @@
   flex-direction: column;
   max-width: 560px;
 
-  .date {
-    max-width: 200px;
-  }
-
   .submit-button {
     margin: 16px 0;
   }