diff --git a/webapp/packages/core-theming/src/styles/_form-controls.scss b/webapp/packages/core-theming/src/styles/_form-controls.scss
index 3fd88093c7..8e9bb39265 100644
--- a/webapp/packages/core-theming/src/styles/_form-controls.scss
+++ b/webapp/packages/core-theming/src/styles/_form-controls.scss
@@ -88,11 +88,19 @@
       @include mdc-theme-prop(border-color, input-border-readonly, false);
       @include mdc-theme-prop(background-color, input-background-readonly, false);
       opacity: 0.8;
+      &:-internal-autofill-selected,
+      &:-internal-autofill-previewed {
+        box-shadow: 0 0 0 50px $input-background-readonly inset;
+      }
     }
     &:global([disabled]) {
       @include mdc-theme-prop(border-color, input-border-disabled, false);
       @include mdc-theme-prop(background-color, input-background-disabled, false);
       opacity: 0.7;
+      &:-internal-autofill-selected,
+      &:-internal-autofill-previewed {
+        box-shadow: 0 0 0 50px $input-background-disabled inset;
+      }
     }
     &:global([data-embedded]) {
       &:global([disabled]),