diff --git a/public/app/partials/dashboard.html b/public/app/partials/dashboard.html
index b25ba94ff84..cecbc7aa28a 100644
--- a/public/app/partials/dashboard.html
+++ b/public/app/partials/dashboard.html
@@ -1,7 +1,7 @@
 <div dash-class ng-if="dashboard">
 	<dashnav dashboard="dashboard"></dashnav>
 
-	<div class="dashboard-container">
+	<div class="dashboard-container scroll-canvas">
 		<div dash-editor-view class="dash-edit-view"></div>
 		<div class="clearfix"></div>
 
diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss
index 22ed043b37b..f22036dd266 100644
--- a/public/sass/_grafana.scss
+++ b/public/sass/_grafana.scss
@@ -60,7 +60,6 @@
 @import "components/filter-controls";
 @import "components/filter-list";
 @import "components/filter-table";
-@import "components/scrollbar";
 @import "components/old_stuff";
 @import "components/typeahead";
 @import "components/modals";
diff --git a/public/sass/components/_scrollbar.scss b/public/sass/components/_scrollbar.scss
deleted file mode 100644
index 85227625a8d..00000000000
--- a/public/sass/components/_scrollbar.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Srollbars
-//
-
-::-webkit-scrollbar {
-  width: 8px;
-  height: 8px;
-}
-
-::-webkit-scrollbar:hover {
-  height: 8px;
-}
-
-::-webkit-scrollbar-button:start:decrement,
-::-webkit-scrollbar-button:end:increment { display: none;  }
-::-webkit-scrollbar-button:horizontal:decrement {  display: none; }
-::-webkit-scrollbar-button:horizontal:increment {  display: none; }
-::-webkit-scrollbar-button:vertical:decrement { display: none; }
-::-webkit-scrollbar-button:vertical:increment { display: none; }
-::-webkit-scrollbar-button:horizontal:decrement:active { background-image: none; }
-::-webkit-scrollbar-button:horizontal:increment:active { background-image: none; }
-::-webkit-scrollbar-button:vertical:decrement:active { background-image: none; }
-::-webkit-scrollbar-button:vertical:increment:active {background-image: none; }
-::-webkit-scrollbar-track-piece { background-color: transparent; }
-
-::-webkit-scrollbar-thumb:vertical {
-  height: 50px;
-  background: -webkit-gradient(linear, left top, right top, color-stop(0%, $scrollbarBackground), color-stop(100%, $scrollbarBackground2));
-  border: 1px solid $scrollbarBorder;
-  border-top: 1px solid $scrollbarBorder;
-  border-left: 1px solid $scrollbarBorder;
-}
-
-::-webkit-scrollbar-thumb:horizontal {
-  width: 50px;
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, $scrollbarBackground), color-stop(100%, $scrollbarBackground2));
-  border: 1px solid $scrollbarBorder;
-  border-top: 1px solid $scrollbarBorder;
-  border-left: 1px solid $scrollbarBorder;
-}
-