diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
index e637df94c6..5955241fb9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
@@ -20,7 +20,6 @@
                               ng-model="name"
                               ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}"
                               umb-auto-focus
-                              focus-on-filled="true"
                               required />
                    </ng-form>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
index 5bf9f8a4a5..be79f797a0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
@@ -3,12 +3,11 @@
    <umb-load-indicator ng-if="page.loading"></umb-load-indicator>
 
    <form name="contentForm"
-      ng-show="!page.loading"
       ng-submit="save()"
       novalidate
       val-form-manager>
 
-      <umb-editor-view umb-tabs>
+      <umb-editor-view ng-if="!page.loading" umb-tabs>
 
          <umb-editor-header
             menu="page.menu"
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
index 1c80fa44c1..fc53982b90 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
@@ -3,12 +3,11 @@
    <umb-load-indicator ng-if="page.loading"></umb-load-indicator>
 
    <form name="contentForm"
-      ng-show="!page.loading"
       ng-submit="save()"
       novalidate
       val-form-manager>
 
-      <umb-editor-view>
+      <umb-editor-view ng-if="!page.loading">
 
          <umb-editor-header
             menu="page.menu"
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
index bfe6dd746a..e30d75b1f3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
@@ -3,11 +3,10 @@
     <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
 
     <form novalidate name="contentTypeForm"
-          ng-show="!vm.page.loading"
           ng-submit="vm.save()"
           val-form-manager>
 
-        <umb-editor-view>
+        <umb-editor-view ng-if="!vm.page.loading">
 
             <umb-editor-header
                     name="vm.contentType.name"
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/edit.html b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
index 5bcd4cb750..8929d143b7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
@@ -3,11 +3,10 @@
    <umb-load-indicator ng-if="page.loading"></umb-load-indicator>
 
    <form novalidate name="contentForm"
-      ng-show="!page.loading"
       ng-submit="save()"
       val-form-manager>
 
-      <umb-editor-view umb-tabs>
+      <umb-editor-view ng-if="!page.loading" umb-tabs>
 
          <umb-editor-header
             name="content.name"
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
index 93da205db6..d8f82a64ff 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
@@ -3,10 +3,10 @@
    <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
 
     <form novalidate name="contentTypeForm"
-          ng-show="!vm.page.loading"
           ng-submit="vm.save()"
           val-form-manager>
-        <umb-editor-view>
+
+        <umb-editor-view ng-if="!vm.page.loading">
 
             <umb-editor-header
                     name="vm.contentType.name"
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/edit.html b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
index 80a9d39756..51b937cd85 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
@@ -3,11 +3,10 @@
    <umb-load-indicator ng-if="page.loading"></umb-load-indicator>
 
    <form novalidate name="contentForm"
-      ng-show="!page.loading"
       ng-submit="save()"
       val-form-manager>
 
-      <umb-editor-view umb-tabs>
+      <umb-editor-view ng-if="!page.loading" umb-tabs>
 
          <umb-editor-header
             name="content.name"
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html
index 71eaf8e6e7..b8bb2fd569 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html
@@ -3,10 +3,10 @@
    <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
 
     <form novalidate name="contentTypeForm"
-          ng-show="!vm.page.loading"
           ng-submit="vm.save()"
           val-form-manager>
-        <umb-editor-view>
+          
+        <umb-editor-view ng-if="!vm.page.loading">
 
             <umb-editor-header
                     name="vm.contentType.name"