From c4c5a18e9efc4a6efdc0f748c8180acf0a7455ff Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Thu, 2 Sep 2021 16:15:04 +0300
Subject: [PATCH] Wait for general entites to load

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 src/renderer/components/+catalog/catalog.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/+catalog/catalog.tsx b/src/renderer/components/+catalog/catalog.tsx
index 04d31bc95c..098cea1305 100644
--- a/src/renderer/components/+catalog/catalog.tsx
+++ b/src/renderer/components/+catalog/catalog.tsx
@@ -103,8 +103,11 @@ export class Catalog extends React.Component<Props> {
           Notifications.error(<p>Unknown category: {routeTab}</p>);
         }
       }, {fireImmediately: true}),
+
+      reaction(() => catalogEntityRegistry.getById("catalog-entity"), () => {
+        this.setActiveEntity();
+      }, {fireImmediately: true})
     ]);
-    this.setActiveEntity();
   }
 
   componentWillUnmount() {