diff --git a/Squidex.sln b/Squidex.sln
index 26a5f4eeb..bbe10118b 100644
--- a/Squidex.sln
+++ b/Squidex.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2036
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29020.237
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex", "src\Squidex\Squidex.csproj", "{61F6BBCE-A080-4400-B194-70E2F5D2096E}"
 EndProject
@@ -65,7 +65,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Extensions", "exten
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{7EDE8CF1-B1E4-4005-B154-834B944E0D7A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Web", "src\Squidex.Web\Squidex.Web.csproj", "{5B2D251F-46E3-486A-AE16-E3FE06B559ED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Web", "src\Squidex.Web\Squidex.Web.csproj", "{5B2D251F-46E3-486A-AE16-E3FE06B559ED}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -361,7 +361,7 @@ Global
 		{6A811927-3C37-430A-90F4-503E37123956} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF}
 		{D7166C56-178A-4457-B56A-C615C7450DEE} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF}
 		{C1E5BBB6-6B6A-4DE5-B19D-0538304DE343} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF}
-		{945871B1-77B8-43FB-B53C-27CF385AB756} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF}
+		{945871B1-77B8-43FB-B53C-27CF385AB756} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A}
 		{B51126A8-0D75-4A79-867D-10724EC6AC84} = {94207AA6-4923-4183-A558-E0F8196B8CA3}
 		{5E75AB7D-6F01-4313-AFF1-7F7128FFD71F} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF}
 		{F7771E22-47BD-45C4-A133-FD7F1DE27CA0} = {7EDE8CF1-B1E4-4005-B154-834B944E0D7A}
diff --git a/src/Squidex/app/shared/state/schemas.state.ts b/src/Squidex/app/shared/state/schemas.state.ts
index 34a44d4ba..ef6051b74 100644
--- a/src/Squidex/app/shared/state/schemas.state.ts
+++ b/src/Squidex/app/shared/state/schemas.state.ts
@@ -322,23 +322,21 @@ function getField(x: SchemaDetailsDto, request: AddFieldDto, parent?: RootFieldD
 }
 
 function buildCategories(categories: string[], schemas: SchemasList): SchemaCategory[] {
-    const uniqueCategories: { [name: string]: string } = {};
+    const uniqueCategories: { [name: string]: true } = {};
 
     for (let category of categories) {
-        uniqueCategories[category] = category;
+        uniqueCategories[category] = true;
     }
 
     for (let schema of schemas.values) {
-        uniqueCategories[schema.category || 'Schemas'] = schema.category;
+        uniqueCategories[getCategory(schema)] = true;
     }
 
     const result: SchemaCategory[] = [];
 
     for (let name in uniqueCategories) {
         if (uniqueCategories.hasOwnProperty(name)) {
-            const key = uniqueCategories[name];
-
-            result.push({ name, upper: name.toUpperCase(), schemas: schemas.filter(x => isSameCategory(key, x))});
+            result.push({ name, upper: name.toUpperCase(), schemas: schemas.filter(x => isSameCategory(name, x))});
         }
     }
 
@@ -347,6 +345,10 @@ function buildCategories(categories: string[], schemas: SchemasList): SchemaCate
     return result;
 }
 
+function getCategory(schema: SchemaDto) {
+    return schema.category || 'Schemas';
+}
+
 export function isSameCategory(name: string, schema: SchemaDto): boolean {
-    return (!name && !schema.category) || schema.category === name;
+    return getCategory(schema) === name;
 }
\ No newline at end of file