diff --git a/public/app/core/components/ScrollBar/ScrollBar.tsx b/public/app/core/components/ScrollBar/ScrollBar.tsx
new file mode 100644
index 00000000000..49a200b0f3b
--- /dev/null
+++ b/public/app/core/components/ScrollBar/ScrollBar.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import PerfectScrollbar from 'perfect-scrollbar';
+
+export interface Props {
+  children: any;
+  className: string;
+}
+
+export default class ScrollBar extends React.Component<Props, any> {
+
+  private container: any;
+  private ps: PerfectScrollbar;
+
+  constructor(props) {
+    super(props);
+  }
+
+  componentDidMount() {
+    this.ps = new PerfectScrollbar(this.container);
+  }
+
+  componentDidUpdate() {
+    this.ps.update();
+  }
+
+  componentWillUnmount() {
+    this.ps.destroy();
+  }
+
+  // methods can be invoked by outside
+  setScrollTop(top) {
+    if (this.container) {
+      this.container.scrollTop = top;
+      this.ps.update();
+
+      return true;
+    }
+    return false;
+  }
+
+  setScrollLeft(left) {
+    if (this.container) {
+      this.container.scrollLeft = left;
+      this.ps.update();
+
+      return true;
+    }
+    return false;
+  }
+
+  handleRef = ref => {
+    this.container = ref;
+  };
+
+  render() {
+    return (
+      <div className={this.props.className} ref={this.handleRef}>
+        {this.props.children}
+      </div>
+    );
+  }
+}
diff --git a/public/app/features/dashboard/dashboard_ctrl.ts b/public/app/features/dashboard/dashboard_ctrl.ts
index 750826d386d..2c9d028ddf8 100644
--- a/public/app/features/dashboard/dashboard_ctrl.ts
+++ b/public/app/features/dashboard/dashboard_ctrl.ts
@@ -129,7 +129,6 @@ export class DashboardCtrl implements PanelContainer {
     }
 
     getPanelContainer() {
-      console.log('DashboardCtrl:getPanelContainer()');
       return this;
     }
 
diff --git a/public/app/features/dashboard/dashgrid/AddPanelPanel.tsx b/public/app/features/dashboard/dashgrid/AddPanelPanel.tsx
index 0dd4b9fcad6..75c8cbf36bc 100644
--- a/public/app/features/dashboard/dashgrid/AddPanelPanel.tsx
+++ b/public/app/features/dashboard/dashgrid/AddPanelPanel.tsx
@@ -4,6 +4,7 @@ import _ from 'lodash';
 import config from 'app/core/config';
 import {PanelModel} from '../panel_model';
 import {PanelContainer} from './PanelContainer';
+import ScrollBar from 'app/core/components/ScrollBar/ScrollBar';
 
 export interface AddPanelPanelProps {
   panel: PanelModel;
@@ -78,9 +79,9 @@ export class AddPanelPanel extends React.Component<AddPanelPanelProps, AddPanelP
             <span className="add-panel__title">New Panel</span>
             <span className="add-panel__sub-title">Select a visualization</span>
           </div>
-          <div className="add-panel__items">
+          <ScrollBar className="add-panel__items">
             {this.state.panelPlugins.map(this.renderPanelItem.bind(this))}
-          </div>
+          </ScrollBar>
         </div>
       </div>
     );
diff --git a/public/app/features/panel/panel_header.ts b/public/app/features/panel/panel_header.ts
index c83aea05527..5429a992a71 100644
--- a/public/app/features/panel/panel_header.ts
+++ b/public/app/features/panel/panel_header.ts
@@ -84,6 +84,7 @@ function panelHeader($compile) {
     restrict: 'E',
     template: template,
     link: function(scope, elem, attrs) {
+      console.log(elem.html());
 
       let menuElem = elem.find('.panel-menu');
       let menuScope;
diff --git a/public/sass/components/_panel_add_panel.scss b/public/sass/components/_panel_add_panel.scss
index be645574342..19eb90b2ea6 100644
--- a/public/sass/components/_panel_add_panel.scss
+++ b/public/sass/components/_panel_add_panel.scss
@@ -35,6 +35,7 @@
   height: calc(100% - 43px);
   align-content: flex-start;
   justify-content: space-around;
+  position: relative;
 }
 
 .add-panel__item {