diff --git a/src/kibana/directives/config.js b/src/kibana/directives/config.js
index 6c6d60998404..a29a2ff44a55 100644
--- a/src/kibana/directives/config.js
+++ b/src/kibana/directives/config.js
@@ -32,7 +32,11 @@ define(function (require) {
         });
 
         var wrapTmpl = function (tmpl) {
-          return '<div class="container-fluid">' + tmpl + '</div>';
+          if ($scope.configSubmit) {
+            return '<form role="form" class="container-fluid" ng-submit="configSubmit()">' + tmpl + '</form>';
+          } else {
+            return '<div class="container-fluid">' + tmpl + '</div>';
+          }
         };
 
         var render = function (newTemplate, oldTemplate) {