diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8322c2c239..3579807e1df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Enhancements
 * **InfluxDB**: Changed multi query encoding to work with InfluxDB 0.11 & 0.12, closes [#4533](https://github.com/grafana/grafana/issues/4533)
+* **Timepicker**: Add arrows and shortcuts for moving back and forth in current dashboard, closes [#119](https://github.com/grafana/grafana/issues/119)
 
 ### Bug fixes
 * **Postgres**: Fixed page render crash when using postgres, fixes [#4558](https://github.com/grafana/grafana/issues/4558)
diff --git a/public/app/features/dashboard/timepicker/timepicker.html b/public/app/features/dashboard/timepicker/timepicker.html
index 864a22e0991..49e2dac27c0 100644
--- a/public/app/features/dashboard/timepicker/timepicker.html
+++ b/public/app/features/dashboard/timepicker/timepicker.html
@@ -1,13 +1,13 @@
 <ul class="nav gf-timepicker-nav">
 
-	<li class="dashnav-zoom-out" style="padding-top: 2px">
+	<li class="dashnav-move-timeframe" style="padding-top: 2px">
                 <a class='small' ng-click='ctrl.move(-1)'>
                         <i class="fa fa-arrow-left"></i>
                 </a>
         </li>
-	<li class="dashnav-zoom-out" style="padding-top: 2px">
+	<li class="dashnav-move-timeframe" style="padding-top: 2px">
                 <a class='small' ng-click='ctrl.move(1)'>
-                        <i class="fa fa-arrow-right"></i> 
+                        <i class="fa fa-arrow-right"></i>
                 </a>
         </li>
 	<li class="dashnav-zoom-out" style="padding-top: 2px">
diff --git a/public/sass/_old_responsive.scss b/public/sass/_old_responsive.scss
index 899a785c19b..a388f9ae26e 100644
--- a/public/sass/_old_responsive.scss
+++ b/public/sass/_old_responsive.scss
@@ -24,6 +24,7 @@
     max-width: 120px;
   }
   .dashnav-zoom-out,
+  .dashnav-move-timeframe,
   .dashnav-action-icons {
     display: none;
   }
@@ -40,6 +41,11 @@
   .gf-timepicker-nav-btn {
     max-width: 120px;
   }
+
+  .dashnav-move-timeframe {
+    display: none;
+  }
+
   .panel-in-fullscreen {
     .dashnav-action-icons {
       display: none;
@@ -60,6 +66,9 @@
   .dashnav-zoom-out {
     display: block;
   }
+  .dashnav-move-timeframe {
+    display: block;
+  }
 }
 
 @include media-breakpoint-up(xl) {
diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss
index 9249af41077..8fb1e6bcdaa 100644
--- a/public/sass/pages/_dashboard.scss
+++ b/public/sass/pages/_dashboard.scss
@@ -96,7 +96,8 @@
   .add-row-panel-hint,
   .dashnav-refresh-action,
   .dashnav-zoom-out,
-  .dashnav-action-icons {
+  .dashnav-action-icons,
+  .dashnav-move-timeframe  {
     display: none;
   }