diff --git a/e2e/suites/viewer/viewer-actions.test.ts b/e2e/suites/viewer/viewer-actions.test.ts
index 3aecd1483..612be248b 100755
--- a/e2e/suites/viewer/viewer-actions.test.ts
+++ b/e2e/suites/viewer/viewer-actions.test.ts
@@ -262,6 +262,9 @@ describe('Viewer actions', () => {
       await uploadNewVersionDialog.uploadButton.click();
       await uploadNewVersionDialog.waitForDialogToClose();
 
+      await viewer.waitForViewerToOpen();
+      await viewer.waitForFileTitleToBeDisplayed(docxFile);
+
       await toolbar.openMoreMenu();
       expect(await toolbar.menu.cancelEditingAction.isPresent()).toBe(false, `'Cancel Editing' button shouldn't be shown`);
       expect(await toolbar.menu.editOfflineAction.isPresent()).toBe(true, `'Edit Offline' should be shown`);
diff --git a/projects/aca-testing-shared/src/components/viewer/viewer.ts b/projects/aca-testing-shared/src/components/viewer/viewer.ts
index ad0d66cc6..e3eb46998 100755
--- a/projects/aca-testing-shared/src/components/viewer/viewer.ts
+++ b/projects/aca-testing-shared/src/components/viewer/viewer.ts
@@ -54,6 +54,15 @@ export class Viewer extends Component {
     }
   }
 
+  async waitForFileTitleToBeDisplayed(fileTitle: string): Promise<void> {
+    try {
+      const fileName = this.byCssText('.adf-viewer__display-name', `${fileTitle}`);
+      await waitForPresence(fileName);
+    } catch (error) {
+      Logger.error('\n-----> catch waitForFileTitle <-----\n', error);
+    }
+  }
+
   async waitForTxtViewerToLoad(): Promise<void> {
     try {
       await this.waitForViewerToOpen();
diff --git a/src/app/components/layout/app-layout/app-layout.component.scss b/src/app/components/layout/app-layout/app-layout.component.scss
index e9e226cab..9f026feab 100644
--- a/src/app/components/layout/app-layout/app-layout.component.scss
+++ b/src/app/components/layout/app-layout/app-layout.component.scss
@@ -17,7 +17,7 @@
   }
 
   adf-file-uploading-dialog {
-    z-index: 1100;
+    z-index: 1000;
   }
 }