diff --git a/scripts/system/create/entityProperties/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js
index d9fbe7c97c..7bfc869f04 100644
--- a/scripts/system/create/entityProperties/html/js/entityProperties.js
+++ b/scripts/system/create/entityProperties/html/js/entityProperties.js
@@ -4491,7 +4491,15 @@ function loaded() {
 }
 
 function showOnTheSamePage(entityType) {
-    if (!GROUPS_PER_TYPE[entityType].includes(currentTab)) {
+    var i;
+    var numbType = entityType.length;
+    var matchingType = 0;
+    for (i = 0; i < numbType; i++) {
+        if (GROUPS_PER_TYPE[entityType[i]].includes(currentTab)) {
+            matchingType = matchingType + 1;
+        }
+    }
+    if (matchingType !== numbType) {
         currentTab = "base";
     }
     showPage(currentTab);