diff --git a/app/components/page-header/template.hbs b/app/components/page-header/template.hbs
index 3e36b062b..09129ed2c 100644
--- a/app/components/page-header/template.hbs
+++ b/app/components/page-header/template.hbs
@@ -45,7 +45,7 @@
{{#each item.submenu as |subitem|}}
{{#if subitem.route}}
{{#if (or (not subitem.resource) (rbac-allows resource=subitem.resource scope=subitem.resourceScope))}}
-
+
{{#link-to-as-attrs
ourRoute=subitem.route
ctx=subitem.ctx
diff --git a/app/instance-initializers/nav.js b/app/instance-initializers/nav.js
index 2aff70ff0..cecc3ea6c 100644
--- a/app/instance-initializers/nav.js
+++ b/app/instance-initializers/nav.js
@@ -284,11 +284,10 @@ const rootNav = [
localizedLabel: 'nav.tools.istio',
route: 'authenticated.cluster.istio.cluster-setting',
resourceScope: 'global',
- disableIfClusterNotReady: true,
resource: [],
ctx: [getClusterId],
condition() {
- return !get(this, 'cluster.isWindows');
+ return !get(this, 'cluster.isWindows') && get(this, 'cluster.isReady');
},
},
],