diff --git a/src/renderer/components/cluster-manager/cluster-manager.tsx b/src/renderer/components/cluster-manager/cluster-manager.tsx
index 754bd6a48b..a43ccb527a 100644
--- a/src/renderer/components/cluster-manager/cluster-manager.tsx
+++ b/src/renderer/components/cluster-manager/cluster-manager.tsx
@@ -35,22 +35,13 @@ import { Extensions, extensionsRoute } from "../+extensions";
 import { HotbarMenu } from "../hotbar/hotbar-menu";
 import { EntitySettings, entitySettingsRoute } from "../+entity-settings";
 import { Welcome, welcomeRoute, welcomeURL } from "../+welcome";
-import { hasLoadedView } from "./lens-views";
-import { getActiveClusterEntity } from "../../api/catalog-entity-registry";
-import { ClusterTopbar } from "./cluster-topbar";
 
 @observer
 export class ClusterManager extends React.Component {
   render() {
-    const cluster = getActiveClusterEntity();
-    const isClusterVisible = cluster?.available && cluster?.ready && hasLoadedView(cluster.id);
-
     return (
       <div className="ClusterManager">
         <main>
-          { isClusterVisible && (
-            <ClusterTopbar cluster={cluster}/>
-          )}
           <div id="lens-views"/>
           <Switch>
             <Route component={Welcome} {...welcomeRoute} />
diff --git a/src/renderer/components/cluster-manager/cluster-view.tsx b/src/renderer/components/cluster-manager/cluster-view.tsx
index dc4487afcf..52b4a69403 100644
--- a/src/renderer/components/cluster-manager/cluster-view.tsx
+++ b/src/renderer/components/cluster-manager/cluster-view.tsx
@@ -88,12 +88,7 @@ export class ClusterView extends React.Component {
     const { clusterId, cluster, isReady } = this;
 
     if (cluster && !isReady) {
-      return (
-        <>
-          <ClusterTopbar cluster={cluster}/>
-          <ClusterStatus clusterId={clusterId} className="box center"/>
-        </>
-      );
+      return <ClusterStatus clusterId={clusterId} className="box center"/>;
     }
 
     return null;
@@ -102,6 +97,7 @@ export class ClusterView extends React.Component {
   render() {
     return (
       <div className="ClusterView flex column align-center">
+        {this.cluster && <ClusterTopbar cluster={this.cluster}/>}
         {this.renderStatus()}
       </div>
     );