diff --git a/extensions/metrics-cluster-feature/src/metrics-settings.tsx b/extensions/metrics-cluster-feature/src/metrics-settings.tsx
index cc84af2cf0..f98cb66403 100644
--- a/extensions/metrics-cluster-feature/src/metrics-settings.tsx
+++ b/extensions/metrics-cluster-feature/src/metrics-settings.tsx
@@ -174,11 +174,14 @@ export class MetricsSettings extends React.Component<Props> {
   }
 
   @computed get buttonLabel() {
+    const allDisabled = !this.featureStates.kubeStateMetrics && !this.featureStates.nodeExporter && !this.featureStates.prometheus;
+
     if (this.inProgress && this.canUpgrade) return "Upgrading ...";
+    if (this.inProgress && allDisabled) return "Uninstalling ...";
     if (this.inProgress) return "Applying ...";
     if (this.canUpgrade) return "Upgrade";
 
-    if (this.changed && !this.featureStates.kubeStateMetrics && !this.featureStates.nodeExporter && !this.featureStates.prometheus) {
+    if (this.changed && allDisabled) {
       return "Uninstall";
     }
 
diff --git a/src/common/k8s/resource-stack.ts b/src/common/k8s/resource-stack.ts
index 33b7a337e9..01c7ee84b8 100644
--- a/src/common/k8s/resource-stack.ts
+++ b/src/common/k8s/resource-stack.ts
@@ -131,7 +131,7 @@ export class ResourceStack {
         resourceData = raw.toString();
       }
 
-      if (!resourceData.trim()) return;
+      if (!resourceData.trim()) continue;
 
       const resourceArray = yaml.safeLoadAll(resourceData.toString());
 
diff --git a/src/renderer/components/+entity-settings/entity-settings.tsx b/src/renderer/components/+entity-settings/entity-settings.tsx
index 38c1e74a4e..779cce45d6 100644
--- a/src/renderer/components/+entity-settings/entity-settings.tsx
+++ b/src/renderer/components/+entity-settings/entity-settings.tsx
@@ -83,9 +83,9 @@ export class EntitySettings extends React.Component<Props> {
           { groups.map((group) => (
             <>
               <div className="header">{group[0]}</div>
-              { group[1].map((setting) => (
+              { group[1].map((setting, index) => (
                 <Tab
-                  key={setting.id}
+                  key={index}
                   value={setting.id}
                   label={setting.title}
                   data-testid={`${setting.id}-tab`}
@@ -124,7 +124,7 @@ export class EntitySettings extends React.Component<Props> {
         <section>
           <h2 data-testid={`${activeSetting.id}-header`}>{activeSetting.title}</h2>
           <section>
-            <activeSetting.components.View entity={this.entity} />
+            <activeSetting.components.View entity={this.entity} key={activeSetting.title} />
           </section>
         </section>
       </PageLayout>