diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs
index 25d120d807..b975a0114b 100644
--- a/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs
+++ b/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Cms.Web.Common.Attributes;
@@ -23,9 +24,7 @@ namespace Umbraco.Cms.Web.BackOffice.PropertyEditors
         }
 
         [HttpGet]
-        public IEnumerable<object> GetContentTypes()
-        {
-            return _contentTypeService
+        public IEnumerable<object> GetContentTypes() => _contentTypeService
                 .GetAllElementTypes()
                 .OrderBy(x => x.SortOrder)
                 .Select(x => new
@@ -35,8 +34,7 @@ namespace Umbraco.Cms.Web.BackOffice.PropertyEditors
                     name = x.Name,
                     alias = x.Alias,
                     icon = x.Icon,
-                    tabs = x.CompositionPropertyGroups.Select(y => y.Name).Distinct()
+                    tabs = x.CompositionPropertyGroups.Where(x => x.Type == PropertyGroupType.Group && x.GetParentAlias() is null).Select(y => y.Name).Distinct()
                 });
-        }
     }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 64fc40d84d..3510da73a6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -535,7 +535,7 @@
                     // remove all tabs except the specified tab
                     var tabs = scaffold.variants[0].tabs;
                     var tab = _.find(tabs, function (tab) {
-                        return tab.id !== 0 && (tab.alias.toLowerCase() === contentType.ncTabAlias.toLowerCase() || contentType.ncTabAlias === "");
+                        return tab.id !== 0 && (tab.label.toLowerCase() === contentType.ncTabAlias.toLowerCase() || contentType.ncTabAlias === "");
                     });
                     scaffold.variants[0].tabs = [];
                     if (tab) {