diff --git a/docs/sources/plugins/developing/panels.md b/docs/sources/plugins/developing/panels.md
index 7212e7b4bdf..d679288e2d2 100644
--- a/docs/sources/plugins/developing/panels.md
+++ b/docs/sources/plugins/developing/panels.md
@@ -25,6 +25,8 @@ export class MyPanelCtrl extends PanelCtrl {
   ...
 ```
 
+In this case, make sure the template has a single `<div>...</div>` root.  The plugin loader will modifiy that element adding a scrollbar.
+
 
 
 ### Examples
diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index 3f8c747f28c..e549ca262d3 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -21,9 +21,7 @@ var panelTemplate = `
     </div>
 
     <div class="panel-content">
-      <div class="panel-height-helper">
-        <div><ng-transclude ></ng-transclude></div>
-      </div>
+      <ng-transclude class="panel-height-helper"></ng-transclude>
     </div>
   </div>
 
@@ -115,7 +113,7 @@ module.directive('grafanaPanel', function($rootScope, $document, $timeout) {
           `;
 
           let scrollRoot = panelContent;
-          let scroller = panelContent.find(':first');
+          let scroller = panelContent.find(':first').find(':first');
 
           scrollRoot.addClass(scrollRootClass);
           $(scrollBarHTML).appendTo(scrollRoot);