diff --git a/components/src/directives/focus-first-element/index.ts b/components/src/directives/focus-first-element/index.ts
index ae0caaa0..cb68d37b 100644
--- a/components/src/directives/focus-first-element/index.ts
+++ b/components/src/directives/focus-first-element/index.ts
@@ -5,9 +5,9 @@ export interface FocusFirstHTMLElement extends HTMLElement {
 }
 
 const focusableElements =
-  'input:not([disabled]), select, textarea, [tabindex], [href]';
+  'input:not([disabled]), select, textarea, [tabindex]:not(.oxd-table-header-sort-icon), [href]';
 const excludeElements =
-  'button:not(.oxd-dialog-close-button,.modal-reset-button,[disabled]), i:not(.oxd-table-header-sort-icon)';
+  'button:not(.oxd-dialog-close-button,.modal-reset-button,[disabled])';
 const firstFocusedElementsOnMounted = new Map<string | null, Element>();
 const firstFocusedElementsOnUpdated = new Map<string | null, Element>();
 let previosFocusedElement: Element | null;