diff --git a/public/app/core/services/popover_srv.ts b/public/app/core/services/popover_srv.ts
index 9cd13dfc280..6f61ee742a3 100644
--- a/public/app/core/services/popover_srv.ts
+++ b/public/app/core/services/popover_srv.ts
@@ -69,7 +69,7 @@ function popoverSrv($compile, $rootScope, $timeout) {
 
       openDrop = drop;
       openDrop.open();
-    }, 10);
+    }, 100);
   };
 }
 
diff --git a/public/app/features/annotations/annotations_srv.ts b/public/app/features/annotations/annotations_srv.ts
index 310f565804c..45536d73b98 100644
--- a/public/app/features/annotations/annotations_srv.ts
+++ b/public/app/features/annotations/annotations_srv.ts
@@ -38,7 +38,12 @@ export class AnnotationsSrv {
 
       // filter out annotations that do not belong to requesting panel
       annotations = _.filter(annotations, item => {
-        if (item.panelId && options.panel.id !== item.panelId) {
+        console.log(item);
+        // shownIn === 1 requires annotation matching panel id
+        if (item.source.showIn === 1) {
+          if (item.panelId && options.panel.id === item.panelId) {
+            return true;
+          }
           return false;
         }
         return true;
diff --git a/public/app/features/annotations/editor_ctrl.ts b/public/app/features/annotations/editor_ctrl.ts
index a0a8fda01d1..deb90691d91 100644
--- a/public/app/features/annotations/editor_ctrl.ts
+++ b/public/app/features/annotations/editor_ctrl.ts
@@ -18,13 +18,13 @@ export class AnnotationsEditorCtrl {
     datasource: null,
     iconColor: 'rgba(255, 96, 96, 1)',
     enable: true,
-    show: 0,
+    showIn: 0,
     hide: false,
   };
 
   showOptions: any = [
     {text: 'All Panels', value: 0},
-    {text: 'Specifc Panels', value: 1},
+    {text: 'Specific Panels', value: 1},
   ];
 
   /** @ngInject */
@@ -51,7 +51,7 @@ export class AnnotationsEditorCtrl {
 
   edit(annotation) {
     this.currentAnnotation = annotation;
-    this.currentAnnotation.show = this.currentAnnotation.show || 0;
+    this.currentAnnotation.showIn = this.currentAnnotation.showIn || 0;
     this.currentIsNew = false;
     this.datasourceChanged();
     this.mode = 'edit';
diff --git a/public/app/features/annotations/partials/editor.html b/public/app/features/annotations/partials/editor.html
index b5c631ec6a8..9e8d5cac2d6 100644
--- a/public/app/features/annotations/partials/editor.html
+++ b/public/app/features/annotations/partials/editor.html
@@ -80,7 +80,7 @@
 							<div class="gf-form">
 								<span class="gf-form-label width-7">Show in</span>
 								<div class="gf-form-select-wrapper width-12">
-									<select class="gf-form-input" ng-model="ctrl.currentAnnotation.show" ng-options="f.value as f.text for f in ctrl.showOptions"></select>
+									<select class="gf-form-input" ng-model="ctrl.currentAnnotation.showIn" ng-options="f.value as f.text for f in ctrl.showOptions"></select>
 								</div>
 							</div>
 							<gf-form-switch class="gf-form"
diff --git a/public/app/features/annotations/partials/event_editor.html b/public/app/features/annotations/partials/event_editor.html
index 9454024c801..639c0ad6911 100644
--- a/public/app/features/annotations/partials/event_editor.html
+++ b/public/app/features/annotations/partials/event_editor.html
@@ -2,7 +2,7 @@
 <h5 class="section-heading text-center">Add annotation</h5>
 
 <form name="ctrl.form" class="text-center">
-	<div class="gf-form-group" style="display: inline-block">
+	<div style="display: inline-block">
 		<div class="gf-form">
 			<span class="gf-form-label width-7">Title</span>
 			<input type="text" ng-model="ctrl.annotation.title" class="gf-form-input max-width-20" required>
diff --git a/public/app/partials/dashboard.html b/public/app/partials/dashboard.html
index 7dd925c3f02..7c8ac3e6aed 100644
--- a/public/app/partials/dashboard.html
+++ b/public/app/partials/dashboard.html
@@ -13,7 +13,7 @@
     <dash-row class="dash-row" ng-repeat="row in dashboard.rows" row="row" dashboard="dashboard">
     </dash-row>
 
-    <div ng-show='dashboardMeta.canEdit' class="add-row-panel-hint">
+    <div ng-show='dashboard.meta.canEdit && !dashboard.meta.fullscreen' class="add-row-panel-hint">
       <div class="span12" style="text-align:left;">
         <span style="margin-left: 12px;" ng-click="addRowDefault()" class="pointer btn btn-inverse btn-small">
           <span><i class="fa fa-plus"></i> ADD ROW</span>