diff --git a/src/common/__tests__/catalog-category-registry.test.ts b/src/common/__tests__/catalog-category-registry.test.ts
new file mode 100644
index 0000000000..11f7a88afd
--- /dev/null
+++ b/src/common/__tests__/catalog-category-registry.test.ts
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) 2021 OpenLens Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+import { CatalogCategory, CatalogCategoryRegistry, CatalogCategorySpec } from "../catalog";
+
+class TestCatalogCategoryRegistry extends CatalogCategoryRegistry { }
+
+class TestCatalogCategory extends CatalogCategory {
+  public readonly apiVersion = "catalog.k8slens.dev/v1alpha1";
+  public readonly kind = "CatalogCategory";
+  public metadata = {
+    name: "Test Category",
+    icon: "",
+  };
+  public spec: CatalogCategorySpec = {
+    group: "entity.k8slens.dev",
+    versions: [],
+    names: {
+      kind: "Test"
+    }
+  };
+}
+
+class TestCatalogCategory2 extends CatalogCategory {
+  public readonly apiVersion = "catalog.k8slens.dev/v1alpha1";
+  public readonly kind = "CatalogCategory";
+  public metadata = {
+    name: "Test Category 2",
+    icon: "",
+  };
+  public spec: CatalogCategorySpec = {
+    group: "entity.k8slens.dev",
+    versions: [],
+    names: {
+      kind: "Test2"
+    }
+  };
+}
+
+describe("CatalogCategoryRegistry", () => {
+  it("should remove only the category registered when running the disopser", () => {
+    const registry = new TestCatalogCategoryRegistry();
+
+    expect(registry.items.length).toBe(0);
+
+    const d1 = registry.add(new TestCatalogCategory());
+    const d2 = registry.add(new TestCatalogCategory2());
+
+    expect(registry.items.length).toBe(2);
+
+    d1();
+    expect(registry.items.length).toBe(1);
+
+    d2();
+    expect(registry.items.length).toBe(0);
+  });
+});
diff --git a/src/common/catalog/catalog-category-registry.ts b/src/common/catalog/catalog-category-registry.ts
index ee61429859..207dc2af3d 100644
--- a/src/common/catalog/catalog-category-registry.ts
+++ b/src/common/catalog/catalog-category-registry.ts
@@ -33,18 +33,14 @@ export class CatalogCategoryRegistry {
 
   @action add(category: CatalogCategory): Disposer {
     this.categories.add(category);
-    this.updateGroupKinds(category);
-
-    return () => {
-      this.categories.delete(category);
-      this.groupKinds.clear();
-    };
-  }
-
-  private updateGroupKinds(category: CatalogCategory) {
     this.groupKinds
       .getOrInsert(category.spec.group, ExtendedMap.new)
       .strictSet(category.spec.names.kind, category);
+
+    return () => {
+      this.categories.delete(category);
+      this.groupKinds.get(category.spec.group).delete(category.spec.names.kind);
+    };
   }
 
   @computed get items() {