diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
index dfac875e5e..ccc80dee37 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
@@ -323,7 +323,7 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
                         "contentTypeApiBaseUrl",
                         "DeleteContainer",
                         [{ id: id }])),
-                'Failed to delete content type contaier');
+                'Failed to delete content type container');
         },
 
         /**
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
index f7bba87ad5..a46ac9184e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
@@ -166,7 +166,7 @@ function mediaTypeResource($q, $http, umbRequestHelper, umbDataFormatter, locali
                        "mediaTypeApiBaseUrl",
                        "DeleteContainer",
                        [{ id: id }])),
-               'Failed to delete content type contaier');
+               'Failed to delete content type container');
         },
 
         /**
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.controller.js
index 435ece4bb9..df26473720 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.controller.js
@@ -9,8 +9,9 @@
 function MediaTypesCreateController($scope, $location, navigationService, mediaTypeResource, formHelper, appState, localizationService) {
 
     $scope.model = {
-        folderName: "",
-        creatingFolder: false
+      allowCreateFolder: $scope.currentNode.parentId === null || $scope.currentNode.nodeType === 'container',
+      folderName: "",
+      creatingFolder: false
     };
 
     var node = $scope.currentNode;
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.html b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.html
index bd6ef087f4..36a0fce9f2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.html
@@ -10,20 +10,21 @@
         </h5>
 
         <ul class="umb-actions umb-actions-child">
-          <li class="umb-action">
-            <button class="umb-action-link umb-outline btn-reset" ng-click="createMediaType()" type="button"
-                    umb-auto-focus>
+          <li data-element="action-mediaType" class="umb-action">
+            <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createMediaType()" umb-auto-focus>
               <umb-icon class="icon large" icon="icon-item-arrangement"></umb-icon>
               <span class="menu-label">
-                                <localize key="general_new">New</localize>
-                                <localize key="content_mediatype">Media type</localize>
-                            </span>
+                  <localize key="general_new">New</localize>
+                  <localize key="content_mediatype">Media type</localize>
+              </span>
             </button>
           </li>
-          <li class="umb-action">
-            <button class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()" type="button">
+          <li data-element="action-folder" class="umb-action" ng-if="model.allowCreateFolder">
+            <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
               <umb-icon class="icon large" icon="icon-folder"></umb-icon>
-              <span class="menu-label"><localize key="general_folder">Folder</localize>...</span>
+              <span class="menu-label">
+                <localize key="general_folder">Folder</localize>
+              </span>
             </button>
           </li>
         </ul>
@@ -35,6 +36,7 @@
         <localize key="buttons_somethingElse">Do something else</localize>
       </button>
     </div>
+
   </div>
 
   <div ng-cloak ng-show="model.creatingFolder">
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberTypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/memberTypes/create.controller.js
index 550ad7ed35..4210d162d3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/memberTypes/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/memberTypes/create.controller.js
@@ -9,8 +9,9 @@
 function MemberTypesCreateController($scope, $location, navigationService, memberTypeResource, formHelper, appState, localizationService) {
 
     $scope.model = {
-        folderName: "",
-        creatingFolder: false
+      allowCreateFolder: $scope.currentNode.parentId === null || $scope.currentNode.nodeType === 'container',
+      folderName: "",
+      creatingFolder: false
     };
 
     var node = $scope.currentNode;
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberTypes/create.html b/src/Umbraco.Web.UI.Client/src/views/memberTypes/create.html
index 5bcf6c42bf..ac6f633db8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/memberTypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/memberTypes/create.html
@@ -1,4 +1,5 @@
 <div ng-controller="Umbraco.Editors.MemberTypes.CreateController">
+
     <div class="umbracoDialog umb-dialog-body with-footer">
         <div class="umb-pane" ng-if="!model.creatingFolder">
             <h5>
@@ -6,7 +7,16 @@
             </h5>
 
             <ul class="umb-actions umb-actions-child">
-                <li class="umb-action">
+                <li data-element="action-memberType" class="umb-action">
+                  <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createMemberType()">
+                    <umb-icon icon="icon-item-arrangement" class="icon large"></umb-icon>
+                    <span class="menu-label">
+                      <localize key="general_new">New</localize>
+                      <localize key="content_memberType">Member type</localize>
+                    </span>
+                  </button>
+                </li>
+                <li data-element="action-folder" class="umb-action">
                     <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
                         <umb-icon icon="icon-folder" class="icon large"></umb-icon>
                         <span class="menu-label">
@@ -14,15 +24,6 @@
                         </span>
                     </button>
                 </li>
-                <li class="umb-action">
-                    <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createMemberType()">
-                        <umb-icon icon="icon-item-arrangement" class="icon large"></umb-icon>
-                        <span class="menu-label">
-                            <localize key="general_new">New</localize>&nbsp;
-                            <localize key="content_memberType">Member type</localize>
-                        </span>
-                    </button>
-                </li>
             </ul>
         </div>