diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
index e742e32f8cae..f906ee6d4ade 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
@@ -29,7 +29,8 @@
             data-app-anchor="{{group.id}}"
             data-element="group-{{group.alias}}"
             ng-repeat="group in content.tabs track by group.key"
-            ng-show="(group.parentAlias === activeTabAlias && group.type === 0) || tabs.length === 0">
+            ng-if="group.type === 0"
+            ng-show="group.parentAlias === activeTabAlias || tabs.length === 0">
 
             <div class="umb-group-panel__header">
                 <div id="group-{{group.id}}">{{ group.label }}</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html b/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html
index 5005edadc522..cd98aecc032f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html
@@ -29,7 +29,8 @@
         <div class="umb-group-panel"
              data-element="group-{{group.alias}}"
              ng-repeat="group in vm.model.variants[0].tabs track by group.key"
-             ng-show="(group.parentAlias === vm.activeTabAlias && group.type === 0) || vm.tabs.length === 0">
+             ng-if="group.type === 0"
+             ng-show="group.parentAlias === vm.activeTabAlias || vm.tabs.length === 0">
 
             <div class="umb-group-panel__header">
                 <div id="group-{{group.id}}">{{ group.label }}</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html b/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
index b4be9027b5b0..fc3b3fefce2e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
@@ -21,7 +21,8 @@
         class="umb-group-panel"
         data-element="group-{{group.alias}}"
         ng-repeat="group in content.tabs | filter: { hide : '!' + true } track by group.id"
-        ng-show="(group.parentAlias === vm.activeTabAlias && group.type === 0) || vm.tabs.length === 0">
+        ng-if="group.type === 0"
+        ng-show="group.parentAlias === vm.activeTabAlias || vm.tabs.length === 0">
 
         <div class="umb-group-panel__header">
             <div>{{ group.label }}</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html b/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html
index 305b5d4e77f2..e11ccfcc384a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html
@@ -21,7 +21,8 @@
     class="umb-group-panel"
     data-element="group-{{group.alias}}"
     ng-repeat="group in content.tabs"
-    ng-show="(group.parentAlias === vm.activeTabAlias && group.type === 0) || vm.tabs.length === 0">
+    ng-if="group.type === 0"
+    ng-show="group.parentAlias === vm.activeTabAlias || vm.tabs.length === 0">
 
         <div class="umb-group-panel__header">
             <div>{{ group.label }}</div>