diff --git a/src/components/ha-picker-field.ts b/src/components/ha-picker-field.ts
index 51f652a4c2..0b4d588b23 100644
--- a/src/components/ha-picker-field.ts
+++ b/src/components/ha-picker-field.ts
@@ -121,6 +121,8 @@ export class HaPickerField extends PickerMixin(LitElement) {
       css`
         ha-combo-box-item[disabled] {
           background-color: var(--ha-color-form-background-disabled);
+          --md-list-item-disabled-opacity: 0.5;
+          opacity: 0.5;
           cursor: not-allowed;
         }
         ha-combo-box-item {
@@ -141,13 +143,6 @@ export class HaPickerField extends PickerMixin(LitElement) {
           --md-focus-ring-duration: 0s;
         }
 
-        /* Add Similar focus style as the text field */
-        ha-combo-box-item[disabled]:after {
-          background-color: var(
-            --mdc-text-field-disabled-line-color,
-            rgba(0, 0, 0, 0.42)
-          );
-        }
         ha-combo-box-item:after {
           display: block;
           content: "";
diff --git a/src/components/input/ha-input.ts b/src/components/input/ha-input.ts
index 7d78deecad..bb82d3657e 100644
--- a/src/components/input/ha-input.ts
+++ b/src/components/input/ha-input.ts
@@ -620,6 +620,10 @@ export class HaInput extends LitElement {
       background-color: var(--ha-color-form-background-disabled);
     }
 
+    wa-input:disabled::part(label) {
+      opacity: 0.5;
+    }
+
     wa-input::part(hint) {
       height: var(--ha-space-5);
       margin-block-start: 0;