diff --git a/public/app/features/annotations/editorCtrl.js b/public/app/features/annotations/editorCtrl.js
index 39b072263fc..5a509fe4ca9 100644
--- a/public/app/features/annotations/editorCtrl.js
+++ b/public/app/features/annotations/editorCtrl.js
@@ -20,15 +20,13 @@ function (angular, _, $) {
     };
 
     $scope.init = function() {
-      $scope.editor = { index: 0 };
+      $scope.mode = 'list';
       $scope.datasources = datasourceSrv.getAnnotationSources();
       $scope.annotations = $scope.dashboard.annotations.list;
       $scope.reset();
 
-      $scope.$watch('editor.index', function(newVal) {
-        if (newVal !== 2) {
-          $scope.reset();
-        }
+      $scope.$watch('mode', function(newVal) {
+        if (newVal === 'new') { $scope.reset(); }
       });
     };
 
@@ -43,8 +41,8 @@ function (angular, _, $) {
       $scope.currentAnnotation = annotation;
       $scope.currentIsNew = false;
       $scope.datasourceChanged();
+      $scope.mode = 'edit';
 
-      $scope.editor.index = 2;
       $(".tooltip.in").remove();
     };
 
@@ -57,14 +55,14 @@ function (angular, _, $) {
 
     $scope.update = function() {
       $scope.reset();
-      $scope.editor.index = 0;
+      $scope.mode = 'list';
       $scope.broadcastRefresh();
     };
 
     $scope.add = function() {
       $scope.annotations.push($scope.currentAnnotation);
       $scope.reset();
-      $scope.editor.index = 0;
+      $scope.mode = 'list';
       $scope.updateSubmenuVisibility();
       $scope.broadcastRefresh();
     };
diff --git a/public/app/features/annotations/partials/editor.html b/public/app/features/annotations/partials/editor.html
index 2ff4040d098..851db4b4f01 100644
--- a/public/app/features/annotations/partials/editor.html
+++ b/public/app/features/annotations/partials/editor.html
@@ -6,9 +6,27 @@
 			Annotations
 		</div>
 
-		<div ng-model="editor.index" bs-tabs style="text-transform:capitalize;">
-			<div ng-repeat="tab in ['Overview', 'Add', 'Edit']" data-title="{{tab}}">
-			</div>
+		<div class="tabs">
+			<ul class="nav nav-tabs">
+				<li ng-class="{active: mode === 'list'}">
+					<a ng-click="mode = 'list';">
+						List
+					</a>
+				</li>
+
+				<li ng-class="{active: mode === 'edit'}" ng-show="mode === 'edit'">
+					<a>
+						{{currentAnnotation.name}}
+					</a>
+				</li>
+
+				<li ng-class="{active: mode === 'new'}">
+					<a ng-click="mode = 'new';">
+						<i class="fa fa-plus"></i>
+						New
+					</a>
+				</li>
+			</ul>
 		</div>
 
 		<button class="gf-box-header-close-btn" ng-click="dismiss();">
@@ -17,7 +35,8 @@
 	</div>
 
 	<div class="gf-box-body">
-		<div class="editor-row row" ng-if="editor.index == 0">
+
+		<div class="editor-row row" ng-if="mode === 'list'">
 			<div class="span6">
 				<div ng-if="annotations.length === 0">
 					<em>No annotations defined</em>
@@ -47,7 +66,7 @@
 			</div>
 		</div>
 
-		<div ng-if="editor.index == 1 || (editor.index == 2 && !currentIsNew)">
+		<div ng-if="mode === 'edit' || mode === 'new'">
 			<div class="editor-row">
 				<div class="editor-option">
 					<label class="small">Name</label>
@@ -75,11 +94,10 @@
 			<datasource-editor-view datasource="currentAnnotation.datasource" name="annotations-query-editor"></datasource-editor-view>
 
 			<br>
-			<button ng-show="editor.index === 1" type="button" class="btn btn-success" ng-click="add()">Add</button>
-			<button ng-show="editor.index === 2" type="button" class="btn btn-success pull-left" ng-click="update();">Update</button>
+			<button ng-show="mode === 'new'" type="button" class="btn btn-success" ng-click="add()">Add</button>
+			<button ng-show="mode === 'edit'" type="button" class="btn btn-success pull-left" ng-click="update();">Update</button>
 			<br>
 			<br>
-
 		</div>
 	</div>
 </div>
diff --git a/public/app/plugins/datasource/elasticsearch/queryCtrl.js b/public/app/plugins/datasource/elasticsearch/queryCtrl.js
index 837ceb5017f..00a03207c08 100644
--- a/public/app/plugins/datasource/elasticsearch/queryCtrl.js
+++ b/public/app/plugins/datasource/elasticsearch/queryCtrl.js
@@ -58,7 +58,7 @@ function (angular, _) {
       if ($scope.target.rawQuery) {
         delete $scope.target.rawQuery;
       } else {
-        $scope.target.rawQuery = $scope.rawQueryOld;
+        $scope.target.rawQuery = angular.toJson($scope.datasource.queryBuilder.build($scope.target), true);
       }
     };