diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
index 8f69bf629ce285..c558d9e2d8a31f 100644
--- a/test/functional/page_objects/discover_page.ts
+++ b/test/functional/page_objects/discover_page.ts
@@ -17,11 +17,9 @@
  * under the License.
  */
 
-import expect from '@kbn/expect';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export function DiscoverPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const log = getService('log');
   const retry = getService('retry');
   const testSubjects = getService('testSubjects');
   const find = getService('find');
@@ -51,9 +49,16 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
     }
 
     public async saveSearch(searchName: string) {
-      log.debug('saveSearch');
       await this.clickSaveSearchButton();
-      await testSubjects.setValue('savedObjectTitle', searchName);
+      // preventing an occasional flakiness when the saved object wasn't set and the form can't be submitted
+      await retry.waitFor(
+        `saved search title is set to ${searchName} and save button is clickable`,
+        async () => {
+          const saveButton = await testSubjects.find('confirmSaveSavedObjectButton');
+          await testSubjects.setValue('savedObjectTitle', searchName);
+          return (await saveButton.getAttribute('disabled')) !== 'true';
+        }
+      );
       await testSubjects.click('confirmSaveSavedObjectButton');
       await header.waitUntilLoadingHasFinished();
       // LeeDr - this additional checking for the saved search name was an attempt
@@ -61,9 +66,8 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
       // that the next action wouldn't have to retry.  But it doesn't really solve
       // that issue.  But it does typically take about 3 retries to
       // complete with the expected searchName.
-      await retry.try(async () => {
-        const name = await this.getCurrentQueryName();
-        expect(name).to.be(searchName);
+      await retry.waitFor(`saved search was persisted with name ${searchName}`, async () => {
+        return (await this.getCurrentQueryName()) === searchName;
       });
     }
 
@@ -96,11 +100,11 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
 
       // We need this try loop here because previous actions in Discover like
       // saving a search cause reloading of the page and the "Open" menu item goes stale.
-      await retry.try(async () => {
+      await retry.waitFor('saved search panel is opened', async () => {
         await this.clickLoadSavedSearchButton();
         await header.waitUntilLoadingHasFinished();
         isOpen = await testSubjects.exists('loadSearchForm');
-        expect(isOpen).to.be(true);
+        return isOpen === true;
       });
     }