diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0f1625ac12..7999a964064 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 # 1.8.1 (unreleased)
 
 **Fixes**
+- [Issue #855](https://github.com/grafana/grafana/issues/855). Graph: Fix for scroll issue in graph edit mode when dropdown goes below screen
 - [Issue #847](https://github.com/grafana/grafana/issues/847). Graph: Fix for series draw order not being the same after hiding/unhiding series
 - [Issue #851](https://github.com/grafana/grafana/issues/851). Annotations: Fix for annotations not reloaded when switching between 2 dashboards with annotations
 - [Issue #846](https://github.com/grafana/grafana/issues/846). Edit panes: Issue when open row or json editor when scrolled down the page, unable to scroll and you did not see editor
diff --git a/src/app/panels/graph/styleEditor.html b/src/app/panels/graph/styleEditor.html
index 345e4165f96..9f4c5c3a1fb 100644
--- a/src/app/panels/graph/styleEditor.html
+++ b/src/app/panels/graph/styleEditor.html
@@ -88,7 +88,7 @@
 							{{option.name}}: {{option.value}}
 						</li>
 						<li class="dropdown">
-							<a class="dropdown-toggle grafana-target-segment" data-toggle="dropdown" gf-dropdown="overrideMenu" bs-tooltip="'set option to override'" data-placement="right">
+							<a class="dropdown-toggle grafana-target-segment" data-toggle="dropdown" gf-dropdown="overrideMenu" bs-tooltip="'set option to override'" data-placement="top">
 								<i class="icon-plus"></i>
 							</a>
 						</li>
diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less
index 9b741495c59..78a4fab3fbf 100644
--- a/src/css/less/grafana.less
+++ b/src/css/less/grafana.less
@@ -119,6 +119,10 @@
   .panel-content {
     padding-bottom: 130px;
   }
+
+  .dropdown-menu {
+    margin-bottom: 70px;
+  }
 }
 
 .dashboard-fullscreen {