diff --git a/src/common/front-end-routing/routes/preferences/terminal/navigate-to-terminal-preferences.injectable.ts b/src/features/preferences/common/navigate-to-terminal-preferences.injectable.ts
similarity index 58%
rename from src/common/front-end-routing/routes/preferences/terminal/navigate-to-terminal-preferences.injectable.ts
rename to src/features/preferences/common/navigate-to-terminal-preferences.injectable.ts
index 8f73e556d3..bcc8770f41 100644
--- a/src/common/front-end-routing/routes/preferences/terminal/navigate-to-terminal-preferences.injectable.ts
+++ b/src/features/preferences/common/navigate-to-terminal-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 terminalPreferencesRouteInjectable from "./terminal-preferences-route.injectable";
-import { navigateToRouteInjectionToken } from "../../../navigate-to-route-injection-token";
+import { navigateToRouteInjectionToken } from "../../../common/front-end-routing/navigate-to-route-injection-token";
+import preferencesRouteInjectable from "./preferences-route.injectable";
 
 const navigateToTerminalPreferencesInjectable = getInjectable({
   id: "navigate-to-terminal-preferences",
 
   instantiate: (di) => {
     const navigateToRoute = di.inject(navigateToRouteInjectionToken);
-    const route = di.inject(terminalPreferencesRouteInjectable);
+    const route = di.inject(preferencesRouteInjectable);
 
-    return () => navigateToRoute(route);
+    return () => navigateToRoute(route, { parameters: { preferenceTabId: "terminal" }});
   },
 });
 
diff --git a/src/renderer/components/+preferences/preferences-navigation/terminal-preferences-navigation-item.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/terminal-preferences-navigation-item.injectable.ts
index f5ad555c3b..2b3ba77113 100644
--- a/src/renderer/components/+preferences/preferences-navigation/terminal-preferences-navigation-item.injectable.ts
+++ b/src/renderer/components/+preferences/preferences-navigation/terminal-preferences-navigation-item.injectable.ts
@@ -4,29 +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 terminalPreferencesRouteInjectable from "../../../../common/front-end-routing/routes/preferences/terminal/terminal-preferences-route.injectable";
-import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab.injectable";
+import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab/navigate-to-preference-tab.injectable";
+import preferenceTabIsActiveInjectable from "./navigate-to-preference-tab/preference-tab-is-active.injectable";
 
 const terminalPreferencesNavigationItemInjectable = getInjectable({
   id: "terminal-preferences-navigation-item",
 
   instantiate: (di) => {
-    const navigateToPreferenceTab = di.inject(
-      navigateToPreferenceTabInjectable,
-    );
-
-    const route = di.inject(terminalPreferencesRouteInjectable);
-
-    const routeIsActive = di.inject(routeIsActiveInjectable, route);
+    const navigateToPreferenceTab = di.inject(navigateToPreferenceTabInjectable);
+    const preferenceTabIsActive = di.inject(preferenceTabIsActiveInjectable, "terminal");
 
     return {
       id: "terminal",
       label: "Terminal",
       parent: "general",
-      navigate: navigateToPreferenceTab(route),
-      isActive: routeIsActive,
+      navigate: () => navigateToPreferenceTab("terminal"),
+      isActive: preferenceTabIsActive,
       isVisible: computed(() => true),
       orderNumber: 50,
     };