diff --git a/src/common/front-end-routing/routes/preferences/kubernetes/navigate-to-kubernetes-preferences.injectable.ts b/src/features/preferences/common/navigate-to-kubernetes-preferences.injectable.ts
similarity index 58%
rename from src/common/front-end-routing/routes/preferences/kubernetes/navigate-to-kubernetes-preferences.injectable.ts
rename to src/features/preferences/common/navigate-to-kubernetes-preferences.injectable.ts
index 35f4de6621..c4409e8963 100644
--- a/src/common/front-end-routing/routes/preferences/kubernetes/navigate-to-kubernetes-preferences.injectable.ts
+++ b/src/features/preferences/common/navigate-to-kubernetes-preferences.injectable.ts
@@ -3,17 +3,17 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import kubernetesPreferencesRouteInjectable from "./kubernetes-preferences-route.injectable";
-import { navigateToRouteInjectionToken } from "../../../navigate-to-route-injection-token";
+import preferencesRouteInjectable from "./preferences-route.injectable";
+import { navigateToRouteInjectionToken } from "../../../common/front-end-routing/navigate-to-route-injection-token";
 
 const navigateToKubernetesPreferencesInjectable = getInjectable({
   id: "navigate-to-kubernetes-preferences",
 
   instantiate: (di) => {
     const navigateToRoute = di.inject(navigateToRouteInjectionToken);
-    const route = di.inject(kubernetesPreferencesRouteInjectable);
+    const route = di.inject(preferencesRouteInjectable);
 
-    return () => navigateToRoute(route);
+    return () => navigateToRoute(route, { parameters: { preferenceTabId: "kubernetes" }});
   },
 });
 
diff --git a/src/renderer/components/+preferences/preferences-navigation/kubernetes-preferences-navigation-item.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/kubernetes-preferences-navigation-item.injectable.ts
index 6147021087..eda0735dc7 100644
--- a/src/renderer/components/+preferences/preferences-navigation/kubernetes-preferences-navigation-item.injectable.ts
+++ b/src/renderer/components/+preferences/preferences-navigation/kubernetes-preferences-navigation-item.injectable.ts
@@ -4,32 +4,23 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { preferenceNavigationItemInjectionToken } from "./preference-navigation-items.injectable";
-import routeIsActiveInjectable from "../../../routes/route-is-active.injectable";
 import { computed } from "mobx";
-import kubernetesPreferencesRouteInjectable from "../../../../common/front-end-routing/routes/preferences/kubernetes/kubernetes-preferences-route.injectable";
-import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab.injectable";
+import preferenceTabIsActiveInjectable from "./navigate-to-preference-tab/preference-tab-is-active.injectable";
+import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab/navigate-to-preference-tab.injectable";
 
 const kubernetesPreferencesNavigationItemInjectable = getInjectable({
   id: "kubernetes-preferences-navigation-item",
 
   instantiate: (di) => {
     const navigateToPreferenceTab = di.inject(navigateToPreferenceTabInjectable);
-
-    const route = di.inject(
-      kubernetesPreferencesRouteInjectable,
-    );
-
-    const routeIsActive = di.inject(
-      routeIsActiveInjectable,
-      route,
-    );
+    const preferenceTabIsActive = di.inject(preferenceTabIsActiveInjectable, "kubernetes");
 
     return {
       id: "kubernetes",
       label: "Kubernetes",
       parent: "general",
-      navigate: navigateToPreferenceTab(route),
-      isActive: routeIsActive,
+      navigate: () => navigateToPreferenceTab("kubernetes"),
+      isActive: preferenceTabIsActive,
       isVisible: computed(() => true),
       orderNumber: 30,
     };
diff --git a/src/renderer/initializers/add-sync-entries.injectable.tsx b/src/renderer/initializers/add-sync-entries.injectable.tsx
index e82819313f..b0dc7b2b86 100644
--- a/src/renderer/initializers/add-sync-entries.injectable.tsx
+++ b/src/renderer/initializers/add-sync-entries.injectable.tsx
@@ -7,7 +7,7 @@ import { Notifications } from "../components/notifications";
 import { getInjectable } from "@ogre-tools/injectable";
 import userStoreInjectable from "../../common/user-store/user-store.injectable";
 import React from "react";
-import navigateToKubernetesPreferencesInjectable from "../../common/front-end-routing/routes/preferences/kubernetes/navigate-to-kubernetes-preferences.injectable";
+import navigateToKubernetesPreferencesInjectable from "../../features/preferences/common/navigate-to-kubernetes-preferences.injectable";
 import loggerInjectable from "../../common/logger.injectable";
 
 const addSyncEntriesInjectable = getInjectable({