diff --git a/test/functional/apps/discover/_field_visualize.ts b/test/functional/apps/discover/_field_visualize.ts
index 46238bf143290..f8f290b259b7e 100644
--- a/test/functional/apps/discover/_field_visualize.ts
+++ b/test/functional/apps/discover/_field_visualize.ts
@@ -49,7 +49,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     it('should visualize a field in area chart', async () => {
-      await PageObjects.discover.clickFieldListItem('phpmemory');
+      await PageObjects.discover.findFieldByName('phpmemory');
       log.debug('visualize a phpmemory field');
       await PageObjects.discover.clickFieldListItemVisualize('phpmemory');
       await PageObjects.header.waitUntilLoadingHasFinished();
@@ -82,7 +82,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
 
     it('should preserve app filters in visualize', async () => {
       await filterBar.addFilter('bytes', 'is between', '3500', '4000');
-      await PageObjects.discover.clickFieldListItem('geo.src');
+      await PageObjects.discover.findFieldByName('geo.src');
       log.debug('visualize a geo.src field with filter applied');
       await PageObjects.discover.clickFieldListItemVisualize('geo.src');
       await PageObjects.header.waitUntilLoadingHasFinished();
@@ -118,7 +118,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
     it('should preserve query in visualize', async () => {
       await queryBar.setQuery('machine.os : ios');
       await queryBar.submitQuery();
-      await PageObjects.discover.clickFieldListItem('geo.dest');
+      await PageObjects.discover.findFieldByName('geo.dest');
       log.debug('visualize a geo.dest field with query applied');
       await PageObjects.discover.clickFieldListItemVisualize('geo.dest');
       await PageObjects.header.waitUntilLoadingHasFinished();
diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
index 1d4e51360f319..b2954a2deb978 100644
--- a/test/functional/page_objects/discover_page.ts
+++ b/test/functional/page_objects/discover_page.ts
@@ -40,6 +40,11 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
       return await el.getVisibleText();
     }
 
+    public async findFieldByName(name: string) {
+      const fieldSearch = await testSubjects.find('fieldFilterSearchInput');
+      await fieldSearch.type(name);
+    }
+
     public async saveSearch(searchName: string) {
       log.debug('saveSearch');
       await this.clickSaveSearchButton();
@@ -238,10 +243,16 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
       await testSubjects.click(`fieldToggle-${field}`);
     }
 
-    public async clickFieldListItemVisualize(field: string) {
-      return await retry.try(async () => {
-        await testSubjects.click(`fieldVisualize-${field}`);
-      });
+    public async clickFieldListItemVisualize(fieldName: string) {
+      const field = await testSubjects.find(`field-${fieldName}-showDetails`);
+      const isActive = await field.elementHasClass('dscSidebarItem--active');
+
+      if (!isActive) {
+        // expand the field to show the "Visualize" button
+        await field.click();
+      }
+
+      await testSubjects.click(`fieldVisualize-${fieldName}`);
     }
 
     public async expectFieldListItemVisualize(field: string) {
diff --git a/x-pack/test/functional/apps/maps/discover.js b/x-pack/test/functional/apps/maps/discover.js
index ce33596476755..43a7a93ad62e4 100644
--- a/x-pack/test/functional/apps/maps/discover.js
+++ b/x-pack/test/functional/apps/maps/discover.js
@@ -17,7 +17,6 @@ export default function({ getService, getPageObjects }) {
 
     it('should link geo_shape fields to Maps application', async () => {
       await PageObjects.discover.selectIndexPattern('geo_shapes*');
-      await PageObjects.discover.clickFieldListItem('geometry');
       await PageObjects.discover.clickFieldListItemVisualize('geometry');
       await PageObjects.header.waitUntilLoadingHasFinished();
       await PageObjects.maps.waitForLayersToLoad();
@@ -37,7 +36,6 @@ export default function({ getService, getPageObjects }) {
       await queryBar.submitQuery();
       await PageObjects.header.waitUntilLoadingHasFinished();
 
-      await PageObjects.discover.clickFieldListItem('geo.coordinates');
       await PageObjects.discover.clickFieldListItemVisualize('geo.coordinates');
       await PageObjects.header.waitUntilLoadingHasFinished();
       await PageObjects.maps.waitForLayersToLoad();