diff --git a/public/app/plugins/datasource/elasticsearch/datasource.js b/public/app/plugins/datasource/elasticsearch/datasource.js
index 9568b66ad74..bd23f0cc2b2 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.js
+++ b/public/app/plugins/datasource/elasticsearch/datasource.js
@@ -3,7 +3,8 @@ define([
   'lodash',
   'config',
   'kbn',
-  'moment'
+  'moment',
+  './directives'
 ],
 function (angular, _, config, kbn, moment) {
   'use strict';
diff --git a/public/app/plugins/datasource/elasticsearch/directives.js b/public/app/plugins/datasource/elasticsearch/directives.js
new file mode 100644
index 00000000000..8ab75f8e4ad
--- /dev/null
+++ b/public/app/plugins/datasource/elasticsearch/directives.js
@@ -0,0 +1,13 @@
+define([
+  'angular',
+],
+function (angular) {
+  'use strict';
+
+  var module = angular.module('grafana.directives');
+
+  module.directive('annotationsQueryEditorElasticsearch', function() {
+    return {templateUrl: 'app/plugins/datasource/elasticsearch/partials/annotations.editor.html'};
+  });
+
+});