diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.html
index 6a4d76d5a7..ce360fdc6f 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.html
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.html
@@ -23,13 +23,14 @@
                     class="mdl-textfield__input"
                     id="name"
                     required
-                    value="Untitled folder"
+                    [(ngModel)]="folderName"
+                    placeholder="Folder name"
                     data-automation-id="name"
                     autocapitalize="none" #name/>
         </div>
     </div>
     <div class="mdl-dialog__actions">
-        <button type="button" (click)="createFolder(name.value)" class="mdl-button">{{ 'BUTTON.CREATE' | translate }}</button>
-        <button type="button" (click)="cancel()" class="mdl-button close">{{ 'BUTTON.CANCEL' | translate }}</button>
+        <button type="button" [disabled]="isFolderNameEmpty()" (click)="createFolder(folderName)" class="mdl-button">{{ 'BUTTON.CREATE' | translate }}</button>
+        <button type="button" (click)="cancel()" class="mdl-button close">{{ 'BUTTON.CANCEL' | translate}}</button>
     </div>
 </dialog>
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts
index bf9b05cfa7..258f2e4e5c 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts
@@ -55,6 +55,8 @@ export class DocumentMenuAction implements OnInit {
 
     message: string;
 
+    folderName: string = '';
+
     constructor(
         private documentListService: DocumentListService,
         private translate: AlfrescoTranslationService) {
@@ -72,7 +74,7 @@ export class DocumentMenuAction implements OnInit {
             .subscribe(
                 res => {
                     let relativeDir = this.currentFolderPath;
-                    console.log(relativeDir);
+                    this.folderName = '';
                     this.success.emit({value: relativeDir});
                 },
                 error => {
@@ -128,4 +130,8 @@ export class DocumentMenuAction implements OnInit {
         }
         return message;
     }
+
+    isFolderNameEmpty() {
+        return this.folderName === '' ? true : false;
+    }
 }