diff --git a/test/functional/apps/context/_context_navigation.ts b/test/functional/apps/context/_context_navigation.ts
index 5085f9a4bf0f0..092324444c3fc 100644
--- a/test/functional/apps/context/_context_navigation.ts
+++ b/test/functional/apps/context/_context_navigation.ts
@@ -36,8 +36,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
   };
 
-  // FLAKY: https://github.com/elastic/kibana/issues/188396
-  describe.skip('discover - context - back navigation', function contextSize() {
+  describe('discover - context - back navigation', function contextSize() {
     before(async () => {
       await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
       await kibanaServer.uiSettings.update({
diff --git a/test/functional/services/data_grid.ts b/test/functional/services/data_grid.ts
index 7df0c5f49bf00..f95de6a65a48c 100644
--- a/test/functional/services/data_grid.ts
+++ b/test/functional/services/data_grid.ts
@@ -324,9 +324,9 @@ export class DataGridService extends FtrService {
     });
 
     if (toggle) {
+      await toggle.scrollIntoViewIfNecessary();
+      await toggle.click();
       await this.retry.waitFor('doc viewer to open', async () => {
-        await toggle!.scrollIntoViewIfNecessary();
-        await toggle!.click();
         return this.isShowingDocViewer();
       });
     } else {