diff --git a/src/kibana/directives/config.js b/src/kibana/directives/config.js
index 2f48bad19bbd..6c6d60998404 100644
--- a/src/kibana/directives/config.js
+++ b/src/kibana/directives/config.js
@@ -32,11 +32,7 @@ define(function (require) {
         });
 
         var wrapTmpl = function (tmpl) {
-          if ($scope.configSubmit) {
-            return '<form role="form" class="container-fluid" ng-submit="configSubmit()">' + tmpl + '</form>';
-          } else {
-            return '<div class="container-fluid">' + tmpl + '</div>';
-          }
+          return '<div class="container-fluid">' + tmpl + '</div>';
         };
 
         var render = function (newTemplate, oldTemplate) {
@@ -74,4 +70,4 @@ define(function (require) {
       }
     };
   });
-});
\ No newline at end of file
+});
diff --git a/src/kibana/plugins/discover/index.html b/src/kibana/plugins/discover/index.html
index ae5fecb2d88b..90dc839d9725 100644
--- a/src/kibana/plugins/discover/index.html
+++ b/src/kibana/plugins/discover/index.html
@@ -38,7 +38,7 @@
     </div>
   </navbar>
 
-  <config config-template="configTemplate" config-object="opts" config-close="configClose" config-submit="opts.saveDataSource"></config>
+  <config config-template="configTemplate" config-object="opts" config-close="configClose"></config>
 
   <div class="container-fluid" role="main">
     <div class="row">
diff --git a/src/kibana/plugins/discover/partials/load_search.html b/src/kibana/plugins/discover/partials/load_search.html
index 1cfcf3605149..2b66911dbafc 100644
--- a/src/kibana/plugins/discover/partials/load_search.html
+++ b/src/kibana/plugins/discover/partials/load_search.html
@@ -1 +1,3 @@
-<saved-object-finder type="searches"></saved-object-finder>
\ No newline at end of file
+<form role="form" class="container-fluid" ng-submit="fetch()">
+  <saved-object-finder type="searches"></saved-object-finder>
+</form>
diff --git a/src/kibana/plugins/discover/partials/save_search.html b/src/kibana/plugins/discover/partials/save_search.html
index 052c25f93c26..ff4aeaa2de93 100644
--- a/src/kibana/plugins/discover/partials/save_search.html
+++ b/src/kibana/plugins/discover/partials/save_search.html
@@ -1,15 +1,17 @@
-<div class="container-fluid">
-  <div class="row">
-    <div class="col-md-12">
-      <div class="form-group">
-        <label for="SaveSearch" class="control-label">Save Search</label>
-        <input id="SaveSearch" ng-model="opts.savedSearch.title" input-focus="select" class="form-control" placeholder="Name this search...">
-      </div>
-      <div class="form-group">
-        <button ng-disabled="!opts.savedSearch.title" type="submit" class="btn btn-primary">
-          Save
-        </button>
+<form role="form" class="container-fluid" ng-submit="opts.saveDataSource()">
+  <div class="container-fluid">
+    <div class="row">
+      <div class="col-md-12">
+        <div class="form-group">
+          <label for="SaveSearch" class="control-label">Save Search</label>
+          <input id="SaveSearch" ng-model="opts.savedSearch.title" input-focus="select" class="form-control" placeholder="Name this search...">
+        </div>
+        <div class="form-group">
+          <button ng-disabled="!opts.savedSearch.title" type="submit" class="btn btn-primary">
+            Save
+          </button>
+        </div>
       </div>
     </div>
   </div>
-</div>
+</form>