diff --git a/components/src/directives/focus-first-element/index.ts b/components/src/directives/focus-first-element/index.ts index 2b772ccbd..8b130211e 100644 --- a/components/src/directives/focus-first-element/index.ts +++ b/components/src/directives/focus-first-element/index.ts @@ -4,7 +4,8 @@ export interface FocusFirstHTMLElement extends HTMLElement { activeElement?: Element | null; } -const focusableElements = 'input, select, textarea, [tabindex], [href]'; +const focusableElements = + 'input:not([disabled]), select, textarea, [tabindex], [href]'; const excludeElements = 'button:not(.oxd-dialog-close-button,.modal-reset-button,[disabled])'; const firstFocusedElementsOnMounted = new Map();