diff --git a/public/app/plugins/panel/graph/legend.js b/public/app/plugins/panel/graph/legend.js
index 11fd3355262..1a4f53b0c0a 100644
--- a/public/app/plugins/panel/graph/legend.js
+++ b/public/app/plugins/panel/graph/legend.js
@@ -101,6 +101,7 @@ function (angular, _, $) {
         }
 
         function render() {
+          console.log('render legend');
           if (firstRender) {
             elem.append($container);
             $container.on('click', '.graph-legend-icon', openColorSelector);
diff --git a/public/app/plugins/panel/graph/module.html b/public/app/plugins/panel/graph/module.html
deleted file mode 100644
index 4fa5f263210..00000000000
--- a/public/app/plugins/panel/graph/module.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="graph-wrapper" ng-class="{'graph-legend-rightside': ctrl.panel.legend.rightSide}">
-	<div class="graph-canvas-wrapper">
-
-		<div ng-if="datapointsWarning" class="datapoints-warning">
-			<span class="small" ng-show="!datapointsCount">
-				No datapoints <tip>No datapoints returned from metric query</tip>
-			</span>
-			<span class="small" ng-show="datapointsOutside">Datapoints outside time range <tip>Can be caused by timezone mismatch between browser and graphite server</tip></span>
-		</div>
-
-		<div grafana-graph class="histogram-chart" ng-dblclick="ctrl.zoomOut()">
-		</div>
-
-	</div>
-
-	<div class="graph-legend-wrapper" ng-if="ctrl.panel.legend.show" graph-legend></div>
-</div>
-
-<div class="clearfix"></div>
-
-
-
diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
index 201d3f3e8c8..0776558c1db 100644
--- a/public/app/plugins/panel/graph/module.ts
+++ b/public/app/plugins/panel/graph/module.ts
@@ -4,6 +4,7 @@ import './graph';
 import './legend';
 import './series_overrides_ctrl';
 
+import template from './template';
 import moment from 'moment';
 import kbn from 'app/core/utils/kbn';
 import _ from 'lodash';
@@ -83,7 +84,7 @@ var panelDefaults = {
 };
 
 class GraphCtrl extends MetricsPanelCtrl {
-  static templateUrl = 'module.html';
+  static template = template;
 
   hiddenSeries: any = {};
   seriesList: any = [];
diff --git a/public/app/plugins/panel/graph/template.ts b/public/app/plugins/panel/graph/template.ts
new file mode 100644
index 00000000000..fc989e659c7
--- /dev/null
+++ b/public/app/plugins/panel/graph/template.ts
@@ -0,0 +1,28 @@
+var template = `
+<div class="graph-wrapper" ng-class="{'graph-legend-rightside': ctrl.panel.legend.rightSide}">
+  <div class="graph-canvas-wrapper">
+
+    <div ng-if="datapointsWarning" class="datapoints-warning">
+      <span class="small" ng-show="!datapointsCount">
+        No datapoints <tip>No datapoints returned from metric query</tip>
+      </span>
+      <span class="small" ng-show="datapointsOutside">
+        Datapoints outside time range
+        <tip>Can be caused by timezone mismatch between browser and graphite server</tip>
+      </span>
+    </div>
+
+    <div grafana-graph class="histogram-chart" ng-dblclick="ctrl.zoomOut()">
+    </div>
+
+  </div>
+
+  <div class="graph-legend-wrapper" graph-legend></div>
+  </div>
+
+<div class="clearfix"></div>
+`;
+
+export default template;
+
+