diff --git a/src/core_plugins/kibana/public/visualize/editor/editor.html b/src/core_plugins/kibana/public/visualize/editor/editor.html
index f49f046a7954a..3193ea41387d3 100644
--- a/src/core_plugins/kibana/public/visualize/editor/editor.html
+++ b/src/core_plugins/kibana/public/visualize/editor/editor.html
@@ -18,6 +18,7 @@
         ng-show="chrome.getVisible()"
         class="fullWidth"
       >
+        <!-- Block searching if the Visualization is linked to a Saved Search. -->
         <div ng-if="vis.type.requiresSearch && state.linked">
           Linked to Saved Search &ldquo;{{ savedVis.savedSearch.title }}&rdquo;
           &nbsp;
@@ -30,7 +31,8 @@
           </a>
         </div>
 
-        <div ng-if="vis.type.requiresSearch && vis.type.options.showQueryBar" class="fullWidth">
+        <!-- Allow searching if there is no linked Saved Search. -->
+        <div ng-if="vis.type.requiresSearch && !state.linked && vis.type.options.showQueryBar" class="fullWidth">
           <query-bar
             query="state.query"
             app-name="'visualize'"
@@ -45,7 +47,7 @@
 
   <!-- Filters. -->
   <filter-bar
-    ng-if="vis.type.options.showFilterBar && state.query.language === 'lucene'"
+    ng-if="vis.type.options.showFilterBar && state.query.language === 'lucene' && !state.linked"
     state="state"
     index-patterns="[indexPattern]"
   ></filter-bar>
diff --git a/src/core_plugins/kibana/public/visualize/editor/editor.js b/src/core_plugins/kibana/public/visualize/editor/editor.js
index 0831d3d7317de..a054beb5da277 100644
--- a/src/core_plugins/kibana/public/visualize/editor/editor.js
+++ b/src/core_plugins/kibana/public/visualize/editor/editor.js
@@ -287,9 +287,9 @@ function VisEditor($scope, $route, timefilter, AppState, $window, kbnUrl, courie
     delete savedVis.savedSearchId;
     parent.set('filter', _.union(searchSource.getOwn('filter'), parent.getOwn('filter')));
 
-    // copy over all state except "aggs", "query" and "filter"
+    // copy over all state except "aggs" and filter, which is already copied
     _(parent.toJSON())
-    .omit(['aggs', 'filter', 'query'])
+    .omit('aggs')
     .forOwn(function (val, key) {
       searchSource.set(key, val);
     })
@@ -298,8 +298,6 @@ function VisEditor($scope, $route, timefilter, AppState, $window, kbnUrl, courie
     $state.query = searchSource.get('query');
     $state.filters = searchSource.get('filter');
     searchSource.inherits(parentsParent);
-
-    $scope.fetch();
   };
 
   init();
diff --git a/src/ui/public/vis/request_handlers/courier.js b/src/ui/public/vis/request_handlers/courier.js
index abb9b0d1c1682..be6a6a4aaed5f 100644
--- a/src/ui/public/vis/request_handlers/courier.js
+++ b/src/ui/public/vis/request_handlers/courier.js
@@ -10,7 +10,9 @@ const CourierRequestHandlerProvider = function (Private, courier, timefilter) {
 
       if (queryFilter && vis.editorMode) {
         searchSource.set('filter', queryFilter.getFilters());
-        searchSource.set('query', appState.query);
+        if (!appState.linked) {
+          searchSource.set('query', appState.query);
+        }
       }
 
       const shouldQuery = () => {
diff --git a/ui_framework/dist/ui_framework.css b/ui_framework/dist/ui_framework.css
index a940125bd77ff..b121a572dfe59 100644
--- a/ui_framework/dist/ui_framework.css
+++ b/ui_framework/dist/ui_framework.css
@@ -2135,7 +2135,9 @@ main {
  *    of this container using padding.
  */
 .kuiLocalNavRow--secondary {
-  padding: 0 10px 10px;
+  height: 40px;
+  /* 1 */
+  padding: 0 10px 0;
   /* 1 */
   -webkit-box-align: start;
   -webkit-align-items: flex-start;
diff --git a/ui_framework/src/components/local_nav/_local_nav.scss b/ui_framework/src/components/local_nav/_local_nav.scss
index d82b7f139c939..32f5166eac10c 100644
--- a/ui_framework/src/components/local_nav/_local_nav.scss
+++ b/ui_framework/src/components/local_nav/_local_nav.scss
@@ -43,6 +43,7 @@
  *    of this container using padding.
  */
 .kuiLocalNavRow--secondary {
-  padding: 0 $localNavSideSpacing 10px; /* 1 */
+  height: 40px; /* 1 */
+  padding: 0 $localNavSideSpacing 0; /* 1 */
   align-items: flex-start; /* 1 */
 }