diff --git a/src/components/UIShell/UIShell.Story.svelte b/src/components/UIShell/UIShell.Story.svelte
index 346427b9..aca6ff90 100644
--- a/src/components/UIShell/UIShell.Story.svelte
+++ b/src/components/UIShell/UIShell.Story.svelte
@@ -83,7 +83,7 @@
           skeleton: false,
           render: SettingsAdjust20,
           title: 'Settings',
-          tabIndex: 0,
+          tabindex: '0',
           focusable: false,
           style: undefined
         }
@@ -222,7 +222,7 @@
           skeleton: false,
           render: ChangeCatalog16,
           title: 'Catalog',
-          tabIndex: 0,
+          tabindex: '0',
           focusable: false,
           style: undefined
         }
@@ -238,7 +238,7 @@
           skeleton: false,
           render: ManageProtection16,
           title: 'Protection',
-          tabIndex: 0,
+          tabindex: '0',
           focusable: false,
           style: undefined
         }
@@ -254,7 +254,7 @@
           skeleton: false,
           render: Recommend16,
           title: 'Recommend',
-          tabIndex: 0,
+          tabindex: '0',
           focusable: false,
           style: undefined
         }
@@ -283,7 +283,7 @@
           skeleton: false,
           render: Settings16,
           title: 'Settings',
-          tabIndex: 0,
+          tabindex: '0',
           focusable: false,
           style: undefined
         }
diff --git a/src/components/UIShell/UIShellRightPanel/ActionSearch.svelte b/src/components/UIShell/UIShellRightPanel/ActionSearch.svelte
index 37050c40..f7f77b65 100644
--- a/src/components/UIShell/UIShellRightPanel/ActionSearch.svelte
+++ b/src/components/UIShell/UIShellRightPanel/ActionSearch.svelte
@@ -10,8 +10,8 @@
   import searchStore from '../searchStore';
   import ActionSearchResult from './ActionSearchResult.svelte';
 
-  let searchTabIndex = 0;
-  let closeTabIndex = -1;
+  let searchTabIndex = '0';
+  let closeTabIndex = '-1';
   let inputSearchField = undefined;
   const dispatch = createEventDispatcher();
 
@@ -46,11 +46,11 @@
   }
 
   $: if (searchIsActive) {
-    searchTabIndex = -1;
-    closeTabIndex = 0;
+    searchTabIndex = '-1';
+    closeTabIndex = '0';
   } else {
-    searchTabIndex = 0;
-    closeTabIndex = -1;
+    searchTabIndex = '0';
+    closeTabIndex = '-1';
   }
 
   $: showResults = $searchStore ? true : false;
diff --git a/src/components/UIShell/UIShellSideNav/HamburgerMenu.svelte b/src/components/UIShell/UIShellSideNav/HamburgerMenu.svelte
index d6120fdc..678ba350 100644
--- a/src/components/UIShell/UIShellSideNav/HamburgerMenu.svelte
+++ b/src/components/UIShell/UIShellSideNav/HamburgerMenu.svelte
@@ -14,7 +14,7 @@
         skeleton: false,
         render: Menu20,
         title: 'Open Menu',
-        tabIndex: 0,
+        tabindex: '0',
         focusable: false,
         style: undefined
       }
diff --git a/src/components/UIShell/UIShellSideNav/UIShellSideNavItem.svelte b/src/components/UIShell/UIShellSideNav/UIShellSideNavItem.svelte
index 2a340aa7..9d1cdbc5 100644
--- a/src/components/UIShell/UIShellSideNav/UIShellSideNavItem.svelte
+++ b/src/components/UIShell/UIShellSideNav/UIShellSideNavItem.svelte
@@ -27,7 +27,7 @@
     skeleton: false,
     render: ChevronDown16,
     title: 'Open Menu',
-    tabIndex: 0,
+    tabindex: '0',
     focusable: false,
     style: undefined
   };
diff --git a/src/components/UIShell/constants.js b/src/components/UIShell/constants.js
index df58a178..2b6b49f5 100644
--- a/src/components/UIShell/constants.js
+++ b/src/components/UIShell/constants.js
@@ -13,7 +13,7 @@ export const leftPanelActions = {
       skeleton: false,
       render: Search20,
       title: 'Search',
-      tabIndex: 0,
+      tabindex: '0',
       focusable: false,
       style: undefined
     }
@@ -25,7 +25,7 @@ export const leftPanelActions = {
       skeleton: false,
       render: Help20,
       title: 'Help',
-      tabIndex: 0,
+      tabindex: '0',
       focusable: false,
       style: undefined
     }
@@ -37,7 +37,7 @@ export const leftPanelActions = {
       skeleton: false,
       render: Notification20,
       title: 'Notifications',
-      tabIndex: 0,
+      tabindex: '0',
       focusable: false,
       style: undefined
     }
@@ -49,7 +49,7 @@ export const leftPanelActions = {
       skeleton: false,
       render: UserAvatar20,
       title: 'Account',
-      tabIndex: 0,
+      tabindex: '0',
       focusable: false,
       style: undefined
     }
@@ -61,7 +61,7 @@ export const leftPanelActions = {
       skeleton: false,
       render: AppSwitcher20,
       title: 'App Switcher',
-      tabIndex: 0,
+      tabindex: '0',
       focusable: false,
       style: undefined
     }
@@ -80,7 +80,7 @@ export const closeIcon = {
   skeleton: false,
   render: Close20,
   title: 'Close',
-  tabIndex: 0,
+  tabindex: '0',
   focusable: false,
   style: undefined
 };