diff --git a/pkg/cmd/web.go b/pkg/cmd/web.go
index a8482185e78..72f19f6675f 100644
--- a/pkg/cmd/web.go
+++ b/pkg/cmd/web.go
@@ -66,12 +66,12 @@ func newMacaron() *macaron.Macaron {
 
 func mapStatic(m *macaron.Macaron, dir string, prefix string) {
 	headers := func(c *macaron.Context) {
-		c.Resp.Header().Set("Cache-Control", "public max-age: 3600")
+		c.Resp.Header().Set("Cache-Control", "public, max-age: 3600")
 	}
 
 	if setting.Env == setting.DEV {
 		headers = func(c *macaron.Context) {
-			c.Resp.Header().Set("Cache-Control", "max-age: 0")
+			c.Resp.Header().Set("Cache-Control", "max-age: 0, must-revalidate")
 		}
 	}
 
diff --git a/src/app/features/dashboard/rowCtrl.js b/src/app/features/dashboard/rowCtrl.js
index 409fee2fd37..527a29a2ad5 100644
--- a/src/app/features/dashboard/rowCtrl.js
+++ b/src/app/features/dashboard/rowCtrl.js
@@ -168,4 +168,12 @@ function (angular, app, _, config) {
     };
   });
 
+  module.directive('panelGhostPanel', function() {
+    return function(scope, element) {
+      var dropZoneSpan = 12 - scope.dashboard.rowSpan(scope.row);
+      element.find('.panel-container').css('height', scope.row.height);
+      element[0].style.width = ((dropZoneSpan / 1.2) * 10) + '%';
+    };
+  });
+
 });
diff --git a/src/app/partials/dashboard.html b/src/app/partials/dashboard.html
index 6d7d0634fcd..29c4d581df3 100644
--- a/src/app/partials/dashboard.html
+++ b/src/app/partials/dashboard.html
@@ -86,6 +86,14 @@
 						<panel-loader type="panel.type" class="panel-margin"></panel-loader>
 					</div>
 
+					<div panel-ghost-panel class="panel ghost-panel panel-margin">
+						<div class="panel-container">
+							<div style="text-align: center">
+								<h2>Add panel</h2>
+							</div>
+						</div>
+					</div>
+
 					<div panel-drop-zone class="panel panel-drop-zone"
 							 ui-on-drop="onDrop($data, row)"
 							 data-drop="true">
diff --git a/src/css/less/panel.less b/src/css/less/panel.less
index 6a8c2355b5b..e3f1fd2b598 100644
--- a/src/css/less/panel.less
+++ b/src/css/less/panel.less
@@ -169,6 +169,18 @@
   }
 }
 
+.ghost-panel {
+  &:hover {
+    .panel-container {
+      visibility: visible;
+    }
+  }
+  .panel-container {
+    visibility: hidden;
+    border: 1px solid @grayDark;
+  }
+}
+
 .panel-time-info {
   font-weight: bold;
   float: right;