diff --git a/public/app/core/components/EmptyListCTA/__snapshots__/EmptyListCTA.jest.tsx.snap b/public/app/core/components/EmptyListCTA/__snapshots__/EmptyListCTA.jest.tsx.snap
index 0598d7ecd4e..0da3d94aaa8 100644
--- a/public/app/core/components/EmptyListCTA/__snapshots__/EmptyListCTA.jest.tsx.snap
+++ b/public/app/core/components/EmptyListCTA/__snapshots__/EmptyListCTA.jest.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`CollorPalette renders correctly 1`] = `
 <div
-  className="empty-list-cta p-t-2 p-b-1"
+  className="empty-list-cta"
 >
   <div
     className="empty-list-cta__title"
diff --git a/public/app/features/annotations/editor_ctrl.ts b/public/app/features/annotations/editor_ctrl.ts
index 0dea22f32ad..f83de99a8c6 100644
--- a/public/app/features/annotations/editor_ctrl.ts
+++ b/public/app/features/annotations/editor_ctrl.ts
@@ -69,6 +69,10 @@ export class AnnotationsEditorCtrl {
     this.reset();
   }
 
+  backToList() {
+    this.mode = 'list';
+  }
+
   add() {
     this.annotations.push(this.currentAnnotation);
     this.reset();
diff --git a/public/app/features/annotations/partials/editor.html b/public/app/features/annotations/partials/editor.html
index b0a0f43a0ec..77d67d3986d 100644
--- a/public/app/features/annotations/partials/editor.html
+++ b/public/app/features/annotations/partials/editor.html
@@ -1,7 +1,7 @@
 
 <div ng-controller="AnnotationsEditorCtrl">
 	<h3 class="dashboard-settings__header">
-		<a ng-click="ctrl.setMode('list')">Annotations</a>
+		<a ng-click="ctrl.backToList()">Annotations</a>
 		<span ng-show="ctrl.mode === 'new'">&gt; New</span>
 		<span ng-show="ctrl.mode === 'edit'">&gt; Edit</span>
 	</h3>
@@ -32,7 +32,7 @@
 			<a type="button" class="btn btn-success" ng-click="ctrl.setupNew();"><i class="fa fa-plus" ></i> New</a>
 		</div>
 
-		<table class="filter-table">
+		<table class="filter-table filter-table--hover">
 			<thead>
 				<tr>
 					<th>Query name</th>