diff --git a/public/app/features/panel/panelSrv.js b/public/app/features/panel/panelSrv.js
index d8e2272436a..33f70ca25da 100644
--- a/public/app/features/panel/panelSrv.js
+++ b/public/app/features/panel/panelSrv.js
@@ -70,6 +70,14 @@ function (angular, _, config) {
       };
 
       $scope.toggleFullscreen = function(edit) {
+        if (edit && $scope.dashboardMeta.canEdit === false) {
+          $scope.appEvent('alert-warning', [
+            'Dashboard not editable',
+            'Use Save As.. feature to create an editable copy of this dashboard.'
+          ]);
+          return;
+        }
+
         $scope.dashboardViewState.update({ fullscreen: true, edit: edit, panelId: $scope.panel.id });
       };
 
diff --git a/public/app/panels/graph/module.js b/public/app/panels/graph/module.js
index b9fff58f670..dfcd5901594 100644
--- a/public/app/panels/graph/module.js
+++ b/public/app/panels/graph/module.js
@@ -29,7 +29,7 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) {
       panelName: 'Graph',
       editIcon:  "fa fa-bar-chart",
       fullscreen: true,
-      metricsEditor: true
+      metricsEditor: true,
     });
 
     $scope.panelMeta.addEditorTab('Axes & Grid', 'app/panels/graph/axisEditor.html');