diff --git a/src/components/AppBarScoreBadge.test.tsx b/src/components/AppBarScoreBadge.test.tsx
index 6285507..75616ca 100644
--- a/src/components/AppBarScoreBadge.test.tsx
+++ b/src/components/AppBarScoreBadge.test.tsx
@@ -7,8 +7,12 @@ import { makeAuditData, makeResult } from '../test-utils';
 // Mock Headlamp lib
 vi.mock('@kinvolk/headlamp-plugin/lib', () => ({
   ApiProxy: { request: vi.fn() },
+  K8s: {
+    useCluster: () => 'test-cluster',
+  },
   Router: {
-    createRouteURL: (name: string) => `/c/test-cluster/${name}`,
+    createRouteURL: (name: string, params?: { cluster?: string }) =>
+      `/c/${params?.cluster ?? 'default'}/${name}`,
   },
 }));
 
diff --git a/src/components/AppBarScoreBadge.tsx b/src/components/AppBarScoreBadge.tsx
index 8f34f77..02b6bbb 100644
--- a/src/components/AppBarScoreBadge.tsx
+++ b/src/components/AppBarScoreBadge.tsx
@@ -1,4 +1,4 @@
-import { Router } from '@kinvolk/headlamp-plugin/lib';
+import { K8s, Router } from '@kinvolk/headlamp-plugin/lib';
 import { useTheme } from '@mui/material/styles';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
@@ -13,6 +13,7 @@ export default function AppBarScoreBadge() {
   const theme = useTheme();
   const { data, loading } = usePolarisDataContext();
   const history = useHistory();
+  const cluster = K8s.useCluster();
 
   if (loading || !data) {
     return null; // Graceful degradation when Polaris unavailable
@@ -35,7 +36,7 @@ export default function AppBarScoreBadge() {
   };
 
   const handleClick = () => {
-    history.push(Router.createRouteURL('polaris'));
+    history.push(Router.createRouteURL('polaris', { cluster: cluster ?? '' }));
   };
 
   return (
diff --git a/src/index.tsx b/src/index.tsx
index e5d068f..5a90bbe 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -99,7 +99,7 @@ registerRoute({
 });
 
 // Register plugin settings
-registerPluginSettings('polaris', PolarisSettings, true);
+registerPluginSettings('headlamp-polaris', PolarisSettings, true);
 
 // Register details view section for supported controller types
 registerDetailsViewSection(({ resource }) => {