diff --git a/demo-shell/src/app/components/files/files.component.html b/demo-shell/src/app/components/files/files.component.html
index 462af0d653..5d6d5c1045 100644
--- a/demo-shell/src/app/components/files/files.component.html
+++ b/demo-shell/src/app/components/files/files.component.html
@@ -34,8 +34,10 @@
                 <adf-toolbar-divider fxFlex="0 0 auto"></adf-toolbar-divider>
 
                 <div fxFlex="0 0 auto" class="adf-document-action-buttons" fxShow fxHide.lt-sm="true">
-                    <button mat-icon-button
-                            [adf-create-folder]="getDocumentListCurrentFolderId()">
+                    <button
+                        mat-icon-button
+                        [disabled]="!canCreateContent(documentList.folderNode)"
+                        [adf-create-folder]="getDocumentListCurrentFolderId()">
                         <mat-icon>create_new_folder</mat-icon>
                     </button>
                     <button mat-icon-button
diff --git a/demo-shell/src/app/components/files/files.component.ts b/demo-shell/src/app/components/files/files.component.ts
index 333c68e0fe..0bd7df2da8 100644
--- a/demo-shell/src/app/components/files/files.component.ts
+++ b/demo-shell/src/app/components/files/files.component.ts
@@ -21,7 +21,7 @@ import {
 } from '@angular/core';
 import { MatDialog } from '@angular/material';
 import { ActivatedRoute, Params, Router } from '@angular/router';
-import { MinimalNodeEntity, NodePaging, Pagination } from 'alfresco-js-api';
+import { MinimalNodeEntity, NodePaging, Pagination, MinimalNodeEntryEntity } from 'alfresco-js-api';
 import {
     AlfrescoApiService, ContentService, TranslationService,
     FileUploadEvent, FolderCreatedEvent, LogService, NotificationService,
@@ -437,6 +437,13 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
         return false;
     }
 
+    canCreateContent(parentNode: MinimalNodeEntryEntity): boolean {
+        if (parentNode) {
+            return this.contentService.hasPermission(parentNode, 'create');
+        }
+        return false;
+    }
+
     onChangePageSize(event: Pagination): void {
         this.preference.paginationSize = event.maxItems;
         this.currentMaxItems = event.maxItems;