diff --git a/src/app/services/element-selector-dialogue.service.ts b/src/app/services/element-selector-dialogue.service.ts
index a12b14e76..195f4cc52 100644
--- a/src/app/services/element-selector-dialogue.service.ts
+++ b/src/app/services/element-selector-dialogue.service.ts
@@ -27,7 +27,7 @@ export class ElementSelectorDialogueService {
 
   open(validTypesToSelect, notAllowedToSelectIds) {
     if (!validTypesToSelect || (validTypesToSelect && validTypesToSelect.length === 0)) {
-      validTypesToSelect = ['CodeSet', 'DataModel', 'DataClass', 'DataType', 'DataElement', 'Term'];
+      validTypesToSelect = ['Folder','CodeSet', 'DataModel', 'DataClass', 'DataType', 'DataElement', 'Term'];
     }
 
     const dg = this.dialog.open(ElementSelectorComponent, {
diff --git a/src/app/utility/element-selector.component.html b/src/app/utility/element-selector.component.html
index 19e94ca70..a789b1e52 100644
--- a/src/app/utility/element-selector.component.html
+++ b/src/app/utility/element-selector.component.html
@@ -22,12 +22,12 @@
         What type of element are you looking for?
         <div style="margin-top: 10px">
           <ul class="list-group" style="cursor: pointer">
-            <!--Not supported for now-->
-            <!--<li class="list-group-item" *ngIf="validTypesToSelect.includes('Folder')">
+           
+            <li class="list-group-item" *ngIf="validTypesToSelect?.includes('Folder')">
                     <div (click)="onElementTypeSelect('Folder')">
-                      <input type="radio" [(ngModel)]="formData.selectedType" style="cursor: pointer;" ngValue="'Folder'"> Folder
+                      <input type="radio" [(ngModel)]="formData.selectedType" style="cursor: pointer;" ngValue="'Folder'"/> Folder
                     </div>
-                    </li>-->
+            </li>
             <li
               class="list-group-item"
               *ngIf="validTypesToSelect?.includes('CodeSet')"
@@ -214,8 +214,8 @@
           </div>
         </div>
       </div>
-      <!--Not supported for now-->
-      <!--<div *ngIf="formData.selectedType == 'Folder'">
+      
+      <div *ngIf="formData.selectedType == 'Folder'">
       <div style="margin-bottom: 10px;margin-left: 5px;">
           Please select a Folder:
       </div>
@@ -227,7 +227,7 @@
                   (nodeClickEvent)="onNodeInTreeSelect($event)"
                   [node]="rootNode"></mdm-folders-tree>
       </div>
-  </div>-->
+  </div>
       <div
         *ngIf="formData.selectedType === 'Term'"
         style="background-color: #fff"
diff --git a/src/app/utility/element-selector.component.ts b/src/app/utility/element-selector.component.ts
index 974a96498..dd6e1feb7 100644
--- a/src/app/utility/element-selector.component.ts
+++ b/src/app/utility/element-selector.component.ts
@@ -223,20 +223,22 @@ export class ElementSelectorComponent implements OnInit {
   }
 
   loadAllFolders = () => {
-    this.loading = true;
-    this.resourceService.folder.list().subscribe(
-      (data: FolderIndexResponse) => {
-        this.loading = false;
+  this.reloading = true;
+  this.resourceService.tree
+    .list(ContainerDomainType.Folders, { domainType: 'folders' })
+    .subscribe(
+      (data) => {
         this.rootNode = {
-          children: data.body.items,
+          children: data.body,
           isRoot: true
         };
+        this.reloading = false;
       },
       () => {
-        this.loading = false;
+        this.reloading = false;
       }
     );
-  };
+};
 
   onTerminologySelect = (terminology: any) => {
     this.dataSource = new MatTableDataSource<any>(null);