diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js
index d3a87791f9..64e3f67fea 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js
@@ -35,6 +35,11 @@ angular.module("umbraco")
                     }
                 }
 
+                var activeApp = apps.filter(x => x.active);
+                if (activeApp.length === 0 && apps.length > 0) {
+                  apps[0].active = true;
+                }
+
                 vm.tabs = apps;
             }