diff --git a/public/app/features/annotations/partials/editor.html b/public/app/features/annotations/partials/editor.html
index f6e2a3a41a5..01171084bf5 100644
--- a/public/app/features/annotations/partials/editor.html
+++ b/public/app/features/annotations/partials/editor.html
@@ -64,32 +64,34 @@
 			</div>
 		</div>
 
-		<div class="gf-form-group annotations-basic-settings" ng-if="mode === 'edit' || mode === 'new'">
-			<div class="gf-form-inline">
-				<div class="gf-form gf-size-max-xxl">
-					<span class="gf-form-label width-10">Name</span>
-					<input type="text" class="gf-form-input" ng-model='currentAnnotation.name' placeholder="name"></input>
+		<div class="annotations-basic-settings" ng-if="mode === 'edit' || mode === 'new'">
+			<div class="gf-form-group">
+				<div class="gf-form-inline">
+					<div class="gf-form gf-size-max-xxl">
+						<span class="gf-form-label width-10">Name</span>
+						<input type="text" class="gf-form-input" ng-model='currentAnnotation.name' placeholder="name"></input>
+					</div>
+					<div class="gf-form">
+						<span class="gf-form-label max-width-10">Datasource</span>
+						<select class="gf-form-input gf-size-auto" ng-model="currentAnnotation.datasource" ng-options="f.name as f.name for f in datasources" ng-change="datasourceChanged()"></select>
+					</div>
 				</div>
-				<div class="gf-form">
-					<span class="gf-form-label max-width-10">Datasource</span>
-					<select class="gf-form-input gf-size-auto" ng-model="currentAnnotation.datasource" ng-options="f.name as f.name for f in datasources" ng-change="datasourceChanged()"></select>
-				</div>
-			</div>
-			<div class="gf-form-inline last-row">
-				<div class="gf-form gf-size-max-xl">
-					<span class="gf-form-label width-10">Icon size</span>
-					<select class="gf-form-input gf-size-md" ng-model="currentAnnotation.iconSize" ng-options="f for f in [7,8,9,10,13,15,17,20,25,30]"></select>
-				</div>
-				<div class="gf-form max-width-10">
-					<spectrum-picker ng-model="currentAnnotation.iconColor"></spectrum-picker>
-					<span class="checkbox-label">Icon color</span>
-				</div>
-				<div class="gf-form max-width-10">
-					<editor-checkbox text="Grid line" model="currentAnnotation.showLine"></editor-checkbox>
-				</div>
-				<div class="gf-form max-width-10">
-					<spectrum-picker ng-model="currentAnnotation.lineColor"></spectrum-picker>
-					<span class="checkbox-label">Line color</span>
+				<div class="gf-form-inline last-row">
+					<div class="gf-form gf-size-max-xl">
+						<span class="gf-form-label width-10">Icon size</span>
+						<select class="gf-form-input gf-size-md" ng-model="currentAnnotation.iconSize" ng-options="f for f in [7,8,9,10,13,15,17,20,25,30]"></select>
+					</div>
+					<div class="gf-form max-width-10">
+						<spectrum-picker ng-model="currentAnnotation.iconColor"></spectrum-picker>
+						<span class="checkbox-label">Icon color</span>
+					</div>
+					<div class="gf-form max-width-10">
+						<editor-checkbox text="Grid line" model="currentAnnotation.showLine"></editor-checkbox>
+					</div>
+					<div class="gf-form max-width-10">
+						<spectrum-picker ng-model="currentAnnotation.lineColor"></spectrum-picker>
+						<span class="checkbox-label">Line color</span>
+					</div>
 				</div>
 			</div>
 
@@ -98,9 +100,11 @@
 				</plugin-component>
 			</rebuild-on-change>
 
-			<div class="gf-button-group">
-				<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>
+			<div class="gf-form">
+				<div class="gf-form-button-row">
+					<button ng-show="mode === 'new'" type="button" class="btn gf-form-button 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>
+				</div>
 			</div>
 		</div>
 	</div>