diff --git a/packages/spark-core/components/_wide-navigation.scss b/packages/spark-core/components/_wide-navigation.scss
index 0c1b686c45..cafd90e2ec 100644
--- a/packages/spark-core/components/_wide-navigation.scss
+++ b/packages/spark-core/components/_wide-navigation.scss
@@ -43,10 +43,11 @@
   font-weight: bold;
 }
 
+.sprk-c-WideNavigation__item:focus-within:not(.sprk-c-WideNavigation__item--sub) > .sprk-c-WideNavigation__link,
 .sprk-c-WideNavigation__item--open > .sprk-c-WideNavigation__link,
 .sprk-c-WideNavigation__item--active > .sprk-c-WideNavigation__link {
   &::after {
-    background-color: $red;
+    background-color: $black;
     content: ' ';
     height: 3px;
     display: block;
@@ -68,7 +69,7 @@
   &:active,
   &:focus,
   &:hover {
-    @include HoverLine($color: $red, $width: 85%);
+    @include HoverLine($color: $black, $width: 85%);
   }
 }
 
@@ -98,7 +99,7 @@
 }
 
 .sprk-c-WideNavigation__arrow {
-  fill: $red;
+  fill: $black;
   width: $icon-m;
   margin: -3px $space-s 0 $space-s; // negative margin to visually align the arrow
 }
diff --git a/packages/spark-core/components/tabs.js b/packages/spark-core/components/tabs.js
index f5ad3e4f47..b0ad428a4b 100644
--- a/packages/spark-core/components/tabs.js
+++ b/packages/spark-core/components/tabs.js
@@ -94,8 +94,10 @@ const bindUIEvents = (element) => {
       event.preventDefault();
       tabpanels[getActiveTabIndex(tabs)].focus();
     } else if (event.keyCode === keys.home) {
+      resetTabs(tabs, tabpanels);
       setActiveTab(tabs[0], tabpanels[0]);
     } else if (event.keyCode === keys.end) {
+      resetTabs(tabs, tabpanels);
       setActiveTab(tabs[tabs.length - 1], tabpanels[tabpanels.length - 1]);
     }
   });
diff --git a/packages/spark-core/components/wide-navigation.js b/packages/spark-core/components/wide-navigation.js
index 0d7f608be6..82ff28d319 100644
--- a/packages/spark-core/components/wide-navigation.js
+++ b/packages/spark-core/components/wide-navigation.js
@@ -24,10 +24,6 @@ const bindUIEvents = (element) => {
 
   element.addEventListener('focusin', (e) => {
     e.stopPropagation();
-    if (e.target.parentNode.classList.contains('sprk-c-WideNavigation__item')
-      && !e.target.parentNode.classList.contains('sprk-c-WideNavigation__item--sub')) {
-      e.target.parentNode.classList.add('sprk-c-WideNavigation__item--open');
-    }
     hideAllDropDowns(subNavContainers, expandableListItems);
     showDropDown(element);
   });