diff --git a/demo-shell/src/app/components/files/files.component.html b/demo-shell/src/app/components/files/files.component.html
index 1234e1f9dc..92526b70fa 100644
--- a/demo-shell/src/app/components/files/files.component.html
+++ b/demo-shell/src/app/components/files/files.component.html
@@ -94,7 +94,9 @@
                         (click)="createLibrary()">
                         <mat-icon>library_add</mat-icon>
                     </button>
-                    <button mat-icon-button
+                    <button
+                        data-automation-id="edit-folder"
+                        mat-icon-button
                             [disabled]="!canEditFolder(documentList.selection)"
                             title="{{ 'DOCUMENT_LIST.TOOLBAR.EDIT_FOLDER' | translate }}"
                             (error)="openSnackMessage($event)"
diff --git a/e2e/content-services/directives/create-folder-directive.e2e.ts b/e2e/content-services/directives/create-folder-directive.e2e.ts
index 66767a35a7..527f5063d4 100644
--- a/e2e/content-services/directives/create-folder-directive.e2e.ts
+++ b/e2e/content-services/directives/create-folder-directive.e2e.ts
@@ -17,7 +17,7 @@
 
 import { LoginPage, NotificationHistoryPage } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import { CreateFolderDialog } from '../../pages/adf/dialog/createFolderDialog';
+import { FolderDialog } from '../../pages/adf/dialog/folderDialog';
 import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
 import { AcsUserModel } from '../../models/ACS/acsUserModel';
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -27,7 +27,7 @@ describe('Create folder directive', function () {
 
     const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
-    const createFolderDialog = new CreateFolderDialog();
+    const createFolderDialog = new FolderDialog();
     const notificationHistoryPage = new NotificationHistoryPage();
     const metadataViewPage = new MetadataViewPage();
     const acsUser = new AcsUserModel();
@@ -73,11 +73,11 @@ describe('Create folder directive', function () {
         const folderName = 'NotEnableFolder';
         contentServicesPage.clickOnCreateNewFolder();
 
-        createFolderDialog.checkCreateBtnIsDisabled();
+        createFolderDialog.checkCreateUpdateBtnIsDisabled();
 
         createFolderDialog.addFolderName(folderName);
 
-        createFolderDialog.checkCreateBtnIsEnabled();
+        createFolderDialog.checkCreateUpdateBtnIsEnabled();
     });
 
     it('[C260156] Should not be possible create two folder with the same name', () => {
@@ -112,7 +112,7 @@ describe('Create folder directive', function () {
         createFolderDialog.addFolderName(folderName);
         createFolderDialog.addFolderDescription(description);
 
-        createFolderDialog.clickOnCreateButton();
+        createFolderDialog.clickOnCreateUpdateButton();
 
         contentServicesPage.checkContentIsDisplayed(folderName);
 
@@ -126,20 +126,20 @@ describe('Create folder directive', function () {
         contentServicesPage.clickOnCreateNewFolder();
 
         createFolderDialog.addFolderName('*');
-        createFolderDialog.checkCreateBtnIsDisabled();
+        createFolderDialog.checkCreateUpdateBtnIsDisabled();
         createFolderDialog.addFolderName('<');
-        createFolderDialog.checkCreateBtnIsDisabled();
+        createFolderDialog.checkCreateUpdateBtnIsDisabled();
         createFolderDialog.addFolderName('>');
-        createFolderDialog.checkCreateBtnIsDisabled();
+        createFolderDialog.checkCreateUpdateBtnIsDisabled();
         createFolderDialog.addFolderName('\\');
-        createFolderDialog.checkCreateBtnIsDisabled();
+        createFolderDialog.checkCreateUpdateBtnIsDisabled();
         createFolderDialog.addFolderName('/');
-        createFolderDialog.checkCreateBtnIsDisabled();
+        createFolderDialog.checkCreateUpdateBtnIsDisabled();
         createFolderDialog.addFolderName('?');
-        createFolderDialog.checkCreateBtnIsDisabled();
+        createFolderDialog.checkCreateUpdateBtnIsDisabled();
         createFolderDialog.addFolderName(':');
-        createFolderDialog.checkCreateBtnIsDisabled();
+        createFolderDialog.checkCreateUpdateBtnIsDisabled();
         createFolderDialog.addFolderName('|');
-        createFolderDialog.checkCreateBtnIsDisabled();
+        createFolderDialog.checkCreateUpdateBtnIsDisabled();
     });
 });
diff --git a/e2e/content-services/directives/edit-folder-directive.e2e.ts b/e2e/content-services/directives/edit-folder-directive.e2e.ts
new file mode 100644
index 0000000000..90ca0ae3a7
--- /dev/null
+++ b/e2e/content-services/directives/edit-folder-directive.e2e.ts
@@ -0,0 +1,250 @@
+/*!
+ * @license
+ * Copyright 2019 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { BrowserActions, LoginPage, NotificationHistoryPage, StringUtil, UploadActions } from '@alfresco/adf-testing';
+import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
+import { FolderDialog } from '../../pages/adf/dialog/folderDialog';
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
+import { browser, protractor } from 'protractor';
+import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
+import { FileModel } from '../../models/ACS/fileModel';
+import resources = require('../../util/resources');
+
+describe('Edit folder directive', function () {
+
+    const loginPage = new LoginPage();
+    const contentServicesPage = new ContentServicesPage();
+    const editFolderDialog = new FolderDialog();
+    const acsUser = new AcsUserModel();
+    const anotherAcsUser = new AcsUserModel();
+    const navigationBarPage = new NavigationBarPage();
+    const notificationHistoryPage = new NotificationHistoryPage();
+    this.alfrescoJsApi = new AlfrescoApi({
+        provider: 'ECM',
+        hostEcm: browser.params.testConfig.adf.url
+    });
+
+    const pdfFile = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PDF.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PDF.file_location
+    });
+
+    const uploadActions = new UploadActions(this.alfrescoJsApi);
+    const updateFolderName = StringUtil.generateRandomString(5);
+    let editFolder, anotherFolder, filePdfNode, subFolder;
+
+    beforeAll(async (done) => {
+        await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(anotherAcsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        editFolder = await uploadActions.createFolder(StringUtil.generateRandomString(5), '-my-');
+
+        anotherFolder = await uploadActions.createFolder(StringUtil.generateRandomString(5), '-my-');
+
+        subFolder = await uploadActions.createFolder(StringUtil.generateRandomString(5), editFolder.entry.id);
+
+        filePdfNode = await uploadActions.uploadFile(pdfFile.location, pdfFile.name, '-my-');
+
+        await this.alfrescoJsApi.core.nodesApi.updateNode(editFolder.entry.id,
+
+            {
+                permissions: {
+                    locallySet: [{
+                        authorityId: anotherAcsUser.getId(),
+                        name: 'Consumer',
+                        accessStatus: 'ALLOWED'
+                    }]
+                }
+            });
+
+        await loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        done();
+    });
+
+    afterAll(async (done) => {
+        await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
+        await uploadActions.deleteFileOrFolder(editFolder.entry.id);
+        await uploadActions.deleteFileOrFolder(anotherFolder.entry.id);
+        await uploadActions.deleteFileOrFolder(filePdfNode.entry.id);
+        done();
+    });
+
+    beforeEach(async (done) => {
+        navigationBarPage.clickHomeButton();
+        navigationBarPage.clickContentServicesButton();
+        contentServicesPage.getContentList().dataTablePage().waitTillContentLoaded();
+        done();
+    });
+
+    it('[C260161] Update folder - Cancel button', async () => {
+        contentServicesPage.getContentList().dataTablePage().selectRow('Display name', editFolder.entry.name);
+        contentServicesPage.getContentList().dataTablePage().checkRowIsSelected('Display name', editFolder.entry.name);
+        contentServicesPage.clickOnEditFolder();
+        editFolderDialog.checkFolderDialogIsDisplayed();
+        expect(editFolderDialog.getDialogTitle()).toBe('Edit folder');
+        expect(editFolderDialog.getFolderName()).toBe(editFolder.entry.name);
+        editFolderDialog.checkCreateUpdateBtnIsEnabled();
+        editFolderDialog.checkCancelBtnIsEnabled();
+        editFolderDialog.clickOnCancelButton();
+        editFolderDialog.checkFolderDialogIsNotDisplayed();
+    });
+
+    it('[C260162] Update folder - Introducing letters', async () => {
+        contentServicesPage.getContentList().dataTablePage().checkContentIsDisplayed('Display name', editFolder.entry.name);
+        contentServicesPage.getContentList().dataTablePage().selectRow('Display name', editFolder.entry.name);
+        contentServicesPage.getContentList().dataTablePage().checkRowIsSelected('Display name', editFolder.entry.name);
+        expect(contentServicesPage.checkEditFolderButtonIsEnabled()).toBe(true);
+        contentServicesPage.clickOnEditFolder();
+        editFolderDialog.checkFolderDialogIsDisplayed();
+        editFolderDialog.checkCreateUpdateBtnIsEnabled();
+        editFolderDialog.addFolderName(editFolder.entry.name + 'a');
+        editFolderDialog.checkCreateUpdateBtnIsEnabled();
+        editFolderDialog.clickOnCancelButton();
+        editFolderDialog.checkFolderDialogIsNotDisplayed();
+        contentServicesPage.getDocumentList().dataTablePage().checkContentIsDisplayed('Display name', editFolder.entry.name);
+    });
+
+    it('[C260163] Update folder name with an existing one', async () => {
+        contentServicesPage.getContentList().dataTablePage().checkContentIsDisplayed('Display name', editFolder.entry.name);
+        contentServicesPage.getContentList().dataTablePage().selectRow('Display name', editFolder.entry.name);
+        contentServicesPage.getContentList().dataTablePage().checkRowIsSelected('Display name', editFolder.entry.name);
+        expect(contentServicesPage.checkEditFolderButtonIsEnabled()).toBe(true);
+        contentServicesPage.clickOnEditFolder();
+        editFolderDialog.checkFolderDialogIsDisplayed();
+        editFolderDialog.checkCreateUpdateBtnIsEnabled();
+        editFolderDialog.addFolderName(anotherFolder.entry.name);
+        editFolderDialog.checkCreateUpdateBtnIsEnabled();
+        editFolderDialog.clickOnCreateUpdateButton();
+        editFolderDialog.checkFolderDialogIsDisplayed();
+        notificationHistoryPage.checkNotifyContains('There\'s already a folder with this name. Try a different name.');
+    });
+
+    it('[C260164] Edit Folder - Unsupported characters', async () => {
+        contentServicesPage.getContentList().dataTablePage().checkContentIsDisplayed('Display name', editFolder.entry.name);
+        contentServicesPage.getContentList().dataTablePage().selectRow('Display name', editFolder.entry.name);
+        contentServicesPage.getContentList().dataTablePage().checkRowIsSelected('Display name', editFolder.entry.name);
+        contentServicesPage.clickOnEditFolder();
+        editFolderDialog.checkFolderDialogIsDisplayed();
+
+        editFolderDialog.addFolderName('a*"<>\\/?:|');
+        expect(editFolderDialog.getValidationMessage()).toBe('Folder name can\'t contain these characters * " < > \\ / ? : |');
+        editFolderDialog.checkCreateUpdateBtnIsDisabled();
+
+        editFolderDialog.addFolderName('a.a');
+        editFolderDialog.checkValidationMessageIsNotDisplayed();
+        editFolderDialog.checkCreateUpdateBtnIsEnabled();
+
+        editFolderDialog.addFolderName('a.');
+        expect(editFolderDialog.getValidationMessage()).toBe('Folder name can\'t end with a period .');
+        editFolderDialog.checkCreateUpdateBtnIsDisabled();
+
+        editFolderDialog.getFolderNameField().clear();
+        editFolderDialog.getFolderNameField().sendKeys(protractor.Key.SPACE);
+        expect(editFolderDialog.getValidationMessage()).toBe('Folder name can\'t contain only spaces');
+        editFolderDialog.checkCreateUpdateBtnIsDisabled();
+
+        editFolderDialog.addFolderName(editFolder.entry.name);
+        editFolderDialog.addFolderDescription('a*"<>\\/?:|');
+        editFolderDialog.checkValidationMessageIsNotDisplayed();
+        editFolderDialog.checkCreateUpdateBtnIsEnabled();
+
+        editFolderDialog.addFolderDescription('a.');
+        editFolderDialog.checkValidationMessageIsNotDisplayed();
+        editFolderDialog.checkCreateUpdateBtnIsEnabled();
+
+        editFolderDialog.addFolderDescription('a.a');
+        editFolderDialog.checkValidationMessageIsNotDisplayed();
+        editFolderDialog.checkCreateUpdateBtnIsEnabled();
+
+        editFolderDialog.getFolderDescriptionField().sendKeys(protractor.Key.SPACE);
+        editFolderDialog.checkValidationMessageIsNotDisplayed();
+        editFolderDialog.checkCreateUpdateBtnIsEnabled();
+        editFolderDialog.clickOnCancelButton();
+        editFolderDialog.checkFolderDialogIsNotDisplayed();
+
+    });
+
+    it('[C260166] Enable/Disable edit folder icon - when file selected', async () => {
+        expect(contentServicesPage.getDocumentList().dataTablePage().getNumberOfSelectedRows()).toBe(0);
+        expect(contentServicesPage.checkEditFolderButtonIsEnabled()).toBe(false);
+        contentServicesPage.getContentList().dataTablePage().checkContentIsDisplayed('Display name', filePdfNode.entry.name);
+        contentServicesPage.getContentList().dataTablePage().selectRow('Display name', filePdfNode.entry.name);
+        contentServicesPage.getContentList().dataTablePage().checkRowIsSelected('Display name', filePdfNode.entry.name);
+        expect(contentServicesPage.checkEditFolderButtonIsEnabled()).toBe(false);
+
+    });
+
+    it('[C260166] Enable/Disable edit folder icon - when multiple folders selected', async () => {
+        contentServicesPage.clickMultiSelectToggle();
+        contentServicesPage.getContentList().dataTablePage().waitTillContentLoaded();
+        contentServicesPage.getContentList().dataTablePage().checkAllRowsButtonIsDisplayed().checkAllRows();
+        contentServicesPage.getContentList().dataTablePage().waitTillContentLoaded();
+        contentServicesPage.getContentList().dataTablePage().checkRowIsChecked('Display name', editFolder.entry.name);
+        contentServicesPage.getContentList().dataTablePage().checkRowIsChecked('Display name', anotherFolder.entry.name);
+        contentServicesPage.getContentList().dataTablePage().clickCheckbox('Display name', filePdfNode.entry.name);
+        contentServicesPage.getContentList().dataTablePage().checkRowIsNotChecked('Display name', filePdfNode.entry.name);
+        expect(contentServicesPage.getContentList().dataTablePage().getNumberOfSelectedRows()).toBe(2);
+        expect(contentServicesPage.checkEditFolderButtonIsEnabled()).toBe(false);
+    });
+
+    it('[C260166] Enable/Disable edit folder icon - when single folder selected', async () => {
+        expect(contentServicesPage.getDocumentList().dataTablePage().getNumberOfSelectedRows()).toBe(0);
+        contentServicesPage.getContentList().dataTablePage().selectRow('Display name', editFolder.entry.name);
+        contentServicesPage.getContentList().dataTablePage().checkRowIsSelected('Display name', editFolder.entry.name);
+        expect(contentServicesPage.getContentList().dataTablePage().getNumberOfSelectedRows()).toBe(1);
+        expect(contentServicesPage.checkEditFolderButtonIsEnabled()).toBe(true);
+    });
+
+    it('[C260165] Update folder name with non-existing one', async () => {
+        contentServicesPage.getContentList().dataTablePage().checkContentIsDisplayed('Display name', editFolder.entry.name);
+        contentServicesPage.getContentList().dataTablePage().selectRow('Display name', editFolder.entry.name);
+        contentServicesPage.getContentList().dataTablePage().checkRowIsSelected('Display name', editFolder.entry.name);
+        contentServicesPage.clickOnEditFolder();
+        editFolderDialog.checkFolderDialogIsDisplayed();
+        editFolderDialog.addFolderName(updateFolderName);
+        editFolderDialog.checkCreateUpdateBtnIsEnabled();
+        editFolderDialog.clickOnCreateUpdateButton();
+        editFolderDialog.checkFolderDialogIsNotDisplayed();
+        contentServicesPage.getDocumentList().dataTablePage().checkContentIsDisplayed('Display name', updateFolderName);
+    });
+
+    describe('Edit Folder - no permission', () => {
+
+        beforeEach(async (done) => {
+            loginPage.loginToContentServicesUsingUserModel(anotherAcsUser);
+            BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files/' + editFolder.entry.id);
+            contentServicesPage.getContentList().dataTablePage().waitTillContentLoaded();
+            done();
+        });
+
+        it('[C260167] Edit folder without permission', async () => {
+            contentServicesPage.getContentList().dataTablePage().checkContentIsDisplayed('Display name', subFolder.entry.name);
+            contentServicesPage.getContentList().dataTablePage().selectRow('Display name', subFolder.entry.name);
+            contentServicesPage.getContentList().dataTablePage().checkRowIsSelected('Display name', subFolder.entry.name);
+            expect(contentServicesPage.checkEditFolderButtonIsEnabled()).toBe(false);
+        });
+
+    });
+
+});
diff --git a/e2e/pages/adf/contentServicesPage.ts b/e2e/pages/adf/contentServicesPage.ts
index cad4a09c79..bef711049c 100644
--- a/e2e/pages/adf/contentServicesPage.ts
+++ b/e2e/pages/adf/contentServicesPage.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { CreateFolderDialog } from './dialog/createFolderDialog';
+import { FolderDialog } from './dialog/folderDialog';
 import { CreateLibraryDialog } from './dialog/createLibraryDialog';
 import { FormControllersPage } from '@alfresco/adf-testing';
 import { DropActions } from '../../actions/drop.actions';
@@ -38,13 +38,14 @@ export class ContentServicesPage {
     contentList = new DocumentListPage(element.all(by.css('adf-upload-drag-area adf-document-list')).first());
     formControllersPage = new FormControllersPage();
     multipleFileUploadToggle = element(by.id('adf-document-list-enable-drop-files'));
-    createFolderDialog = new CreateFolderDialog();
+    createFolderDialog = new FolderDialog();
     createLibraryDialog = new CreateLibraryDialog();
     dragAndDropAction = new DropActions();
     uploadBorder = element(by.id('document-list-container'));
     contentServices = element(by.css('.adf-sidenav-link[data-automation-id="Content Services"]'));
     currentFolder = element(by.css('div[class*="adf-breadcrumb-item adf-active"] div'));
     createFolderButton = element(by.css('button[data-automation-id="create-new-folder"]'));
+    editFolderButton = element(by.css('button[data-automation-id="edit-folder"]'));
     createLibraryButton = element(by.css('button[data-automation-id="create-new-library"]'));
     activeBreadcrumb = element(by.css('div[class*="active"]'));
     tooltip = by.css('div[class*="--text adf-full-width"] span');
@@ -359,6 +360,15 @@ export class ContentServicesPage {
         return this;
     }
 
+    clickOnEditFolder() {
+        BrowserActions.click(this.editFolderButton);
+        return this;
+    }
+
+    checkEditFolderButtonIsEnabled() {
+        return this.editFolderButton.isEnabled();
+    }
+
     openCreateLibraryDialog() {
         BrowserActions.click(this.createLibraryButton);
         this.createLibraryDialog.waitForDialogToOpen();
@@ -369,7 +379,7 @@ export class ContentServicesPage {
         this.clickOnCreateNewFolder();
         this.createFolderDialog.addFolderName(folder);
         browser.sleep(200);
-        this.createFolderDialog.clickOnCreateButton();
+        this.createFolderDialog.clickOnCreateUpdateButton();
         return this;
     }
 
diff --git a/e2e/pages/adf/dialog/createFolderDialog.ts b/e2e/pages/adf/dialog/createFolderDialog.ts
deleted file mode 100644
index 09bafef54e..0000000000
--- a/e2e/pages/adf/dialog/createFolderDialog.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*!
- * @license
- * Copyright 2019 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { browser, by, element } from 'protractor';
-import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing';
-
-export class CreateFolderDialog {
-    folderNameField = element(by.id('adf-folder-name-input'));
-    folderDescriptionField = element(by.id('adf-folder-description-input'));
-    createButton = element(by.id('adf-folder-create-button'));
-    cancelButton = element(by.id('adf-folder-cancel-button'));
-
-    clickOnCreateButton() {
-        BrowserActions.click(this.createButton);
-    }
-
-    checkCreateBtnIsDisabled() {
-        BrowserVisibility.waitUntilElementIsVisible(this.createButton);
-        expect(this.createButton.getAttribute('disabled')).toEqual('true');
-        return this;
-    }
-
-    checkCreateBtnIsEnabled() {
-        this.createButton.isEnabled();
-        return this;
-    }
-
-    clickOnCancelButton() {
-        BrowserActions.click(this.cancelButton);
-    }
-
-    addFolderName(folderName) {
-        BrowserVisibility.waitUntilElementIsVisible(this.folderNameField);
-        BrowserActions.clearSendKeys(this.folderNameField, folderName);
-        browser.driver.sleep(500);
-        return this;
-    }
-
-    addFolderDescription(folderDescription) {
-        BrowserVisibility.waitUntilElementIsVisible(this.folderDescriptionField);
-        BrowserActions.clearSendKeys(this.folderDescriptionField, folderDescription);
-        return this;
-    }
-
-}
diff --git a/e2e/pages/adf/dialog/folderDialog.ts b/e2e/pages/adf/dialog/folderDialog.ts
new file mode 100644
index 0000000000..c4b31ddf53
--- /dev/null
+++ b/e2e/pages/adf/dialog/folderDialog.ts
@@ -0,0 +1,101 @@
+/*!
+ * @license
+ * Copyright 2019 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { browser, by, element } from 'protractor';
+import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing';
+
+export class FolderDialog {
+    folderDialog = element(by.css('adf-folder-dialog'));
+    folderNameField = this.folderDialog.element(by.id('adf-folder-name-input'));
+    folderDescriptionField = this.folderDialog.element(by.id('adf-folder-description-input'));
+    createUpdateButton = this.folderDialog.element(by.id('adf-folder-create-button'));
+    cancelButton = this.folderDialog.element(by.id('adf-folder-cancel-button'));
+    folderTitle = this.folderDialog.element((by.css('h2.mat-dialog-title')));
+    validationMessage = this.folderDialog.element(by.css('div.mat-form-field-subscript-wrapper mat-hint span'));
+
+    getDialogTitle() {
+        return BrowserActions.getText(this.folderTitle);
+    }
+
+    checkFolderDialogIsDisplayed() {
+        BrowserVisibility.waitUntilElementIsVisible(this.folderDialog);
+        return this;
+    }
+
+    checkFolderDialogIsNotDisplayed() {
+        BrowserVisibility.waitUntilElementIsNotVisible(this.folderDialog);
+        return this;
+    }
+
+    clickOnCreateUpdateButton() {
+        BrowserActions.click(this.createUpdateButton);
+    }
+
+    checkCreateUpdateBtnIsDisabled() {
+        BrowserActions.checkIsDisabled(this.createUpdateButton);
+        return this;
+    }
+
+    checkCreateUpdateBtnIsEnabled() {
+        this.createUpdateButton.isEnabled();
+        return this;
+    }
+
+    checkCancelBtnIsEnabled() {
+        this.cancelButton.isEnabled();
+        return this;
+    }
+
+    clickOnCancelButton() {
+        BrowserActions.click(this.cancelButton);
+    }
+
+    addFolderName(folderName) {
+        BrowserVisibility.waitUntilElementIsVisible(this.folderNameField);
+        BrowserActions.clearSendKeys(this.folderNameField, folderName);
+        browser.driver.sleep(500);
+        return this;
+    }
+
+    addFolderDescription(folderDescription) {
+        BrowserVisibility.waitUntilElementIsVisible(this.folderDescriptionField);
+        BrowserActions.clearSendKeys(this.folderDescriptionField, folderDescription);
+        return this;
+    }
+
+    getFolderName() {
+        return this.folderNameField.getAttribute('value');
+    }
+
+    getValidationMessage() {
+        return BrowserActions.getText(this.validationMessage);
+    }
+
+    checkValidationMessageIsNotDisplayed() {
+        BrowserVisibility.waitUntilElementIsNotVisible(this.validationMessage);
+        return this;
+    }
+
+    getFolderNameField() {
+        return this.folderNameField;
+    }
+
+    getFolderDescriptionField() {
+        return this.folderDescriptionField;
+    }
+
+}
diff --git a/lib/testing/src/lib/core/pages/data-table-component.page.ts b/lib/testing/src/lib/core/pages/data-table-component.page.ts
index 5b46da085b..1bb4cc7817 100644
--- a/lib/testing/src/lib/core/pages/data-table-component.page.ts
+++ b/lib/testing/src/lib/core/pages/data-table-component.page.ts
@@ -72,8 +72,8 @@ export class DataTableComponentPage {
 
     clickCheckbox(columnName, columnValue) {
         const checkbox = this.getRowCheckbox(columnName, columnValue);
-        BrowserVisibility.waitUntilElementIsClickable(checkbox);
-        checkbox.click();
+        BrowserActions.click(checkbox);
+        return this;
     }
 
     checkRowIsNotChecked(columnName, columnValue) {
diff --git a/lib/testing/src/lib/core/utils/browser-actions.ts b/lib/testing/src/lib/core/utils/browser-actions.ts
index 049d04c211..dbdf9ac839 100644
--- a/lib/testing/src/lib/core/utils/browser-actions.ts
+++ b/lib/testing/src/lib/core/utils/browser-actions.ts
@@ -54,6 +54,12 @@ export class BrowserActions {
         elementFinder.sendKeys(text);
     }
 
+    static async checkIsDisabled(elementFinder: ElementFinder) {
+        BrowserVisibility.waitUntilElementIsVisible(elementFinder);
+        expect(elementFinder.getAttribute('disabled')).toEqual('true');
+        return this;
+    }
+
     static async closeMenuAndDialogs() {
         return browser.actions().sendKeys(protractor.Key.ESCAPE).perform();
     }