diff --git a/e2e/content-services/metadata/metadata-properties.e2e.ts b/e2e/content-services/metadata/metadata-properties.e2e.ts
index 6afc23d447..94da213ea8 100644
--- a/e2e/content-services/metadata/metadata-properties.e2e.ts
+++ b/e2e/content-services/metadata/metadata-properties.e2e.ts
@@ -135,7 +135,7 @@ describe('CardView Component - properties', () => {
         metadataViewPage.clickOnInformationButton();
 
         metadataViewPage.checkMetadataGroupIsNotExpand('EXIF');
-        metadataViewPage.checkMetadataGroupIsNotExpand('properties');
+        metadataViewPage.checkMetadataGroupIsExpand('properties');
 
         metadataViewPage.clickMetadataGroup('properties');
 
diff --git a/e2e/pages/adf/metadataViewPage.ts b/e2e/pages/adf/metadataViewPage.ts
index 4a247f7364..0ab21906ba 100644
--- a/e2e/pages/adf/metadataViewPage.ts
+++ b/e2e/pages/adf/metadataViewPage.ts
@@ -115,6 +115,7 @@ export class MetadataViewPage {
 
     editIconClick(): promise.Promise<void> {
         BrowserVisibility.waitUntilElementIsVisible(this.editIcon);
+        BrowserVisibility.waitUntilElementIsClickable(this.editIcon);
         return this.editIcon.click();
     }
 
@@ -167,7 +168,7 @@ export class MetadataViewPage {
 
     editPropertyIconIsDisplayed(propertyName: string) {
         const editPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-' + propertyName + '"]'));
-        BrowserVisibility.waitUntilElementIsVisible(editPropertyIcon);
+        BrowserVisibility.waitUntilElementIsPresent(editPropertyIcon);
     }
 
     updatePropertyIconIsDisplayed(propertyName: string) {
@@ -264,13 +265,13 @@ export class MetadataViewPage {
 
     checkMetadataGroupIsNotExpand(groupName: string) {
         const group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"] > mat-expansion-panel-header'));
-        BrowserVisibility.waitUntilElementIsVisible(group);
+        BrowserVisibility.waitUntilElementIsPresent(group);
         expect(group.getAttribute('class')).not.toContain('mat-expanded');
     }
 
     getMetadataGroupTitle(groupName: string): promise.Promise<string> {
         const group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"] > mat-expansion-panel-header > span > mat-panel-title'));
-        BrowserVisibility.waitUntilElementIsVisible(group);
+        BrowserVisibility.waitUntilElementIsPresent(group);
         return group.getText();
     }