diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
index 72276a38f6ac21..56966d6294c9a4 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -57,7 +57,6 @@ const {
   core,
   chrome,
   data,
-  docTitle,
   history,
   indexPatterns,
   filterManager,
@@ -214,6 +213,7 @@ function discoverController(
     isAppStateDirty,
     kbnUrlStateStorage,
     getPreviousAppState,
+    resetInitialAppState,
   } = getState({
     defaultAppState: getStateDefaults(),
     storeInSessionStorage: config.get('state:storeInSessionStorage'),
@@ -373,6 +373,8 @@ function discoverController(
             // If the save wasn't successful, put the original values back.
             if (!response.id || response.error) {
               savedSearch.title = currentTitle;
+            } else {
+              resetInitialAppState();
             }
             return response;
           });
@@ -758,7 +760,7 @@ function discoverController(
           } else {
             // Update defaults so that "reload saved query" functions correctly
             setAppState(getStateDefaults());
-            docTitle.change(savedSearch.lastSavedTitle);
+            chrome.docTitle.change(savedSearch.lastSavedTitle);
           }
         }
       });
diff --git a/x-pack/test/reporting/functional/reporting.js b/x-pack/test/reporting/functional/reporting.js
index b3ef1ab2b54b4f..86fe2fd0393efc 100644
--- a/x-pack/test/reporting/functional/reporting.js
+++ b/x-pack/test/reporting/functional/reporting.js
@@ -14,6 +14,7 @@ export default function({ getService, getPageObjects }) {
   const esArchiver = getService('esArchiver');
   const browser = getService('browser');
   const log = getService('log');
+  const filterBar = getService('filterBar');
   const PageObjects = getPageObjects([
     'reporting',
     'common',
@@ -123,7 +124,27 @@ export default function({ getService, getPageObjects }) {
           expect(await PageObjects.reporting.isGenerateReportButtonDisabled()).to.be(null);
         });
 
+        it('becomes available/not available when a saved search is created, changed and saved again', async () => {
+          // create new search, csv export is not available
+          await PageObjects.discover.clickNewSearchButton();
+          await PageObjects.reporting.openCsvReportingPanel();
+          expect(await PageObjects.reporting.isGenerateReportButtonDisabled()).to.be('true');
+          // save search, csv export is available
+          await PageObjects.discover.saveSearch('my search - expectEnabledGenerateReportButton 2');
+          await PageObjects.reporting.openCsvReportingPanel();
+          expect(await PageObjects.reporting.isGenerateReportButtonDisabled()).to.be(null);
+          // add filter, csv export is not available
+          await filterBar.addFilter('currency', 'is', 'EUR');
+          await PageObjects.reporting.openCsvReportingPanel();
+          expect(await PageObjects.reporting.isGenerateReportButtonDisabled()).to.be('true');
+          // save search again, csv export is available
+          await PageObjects.discover.saveSearch('my search - expectEnabledGenerateReportButton 2');
+          await PageObjects.reporting.openCsvReportingPanel();
+          expect(await PageObjects.reporting.isGenerateReportButtonDisabled()).to.be(null);
+        });
+
         it('generates a report with data', async () => {
+          await PageObjects.discover.clickNewSearchButton();
           await PageObjects.reporting.setTimepickerInDataRange();
           await PageObjects.discover.saveSearch('my search - with data - expectReportCanBeCreated');
           await PageObjects.reporting.openCsvReportingPanel();