diff --git a/public/app/panels/timepicker/module.html b/public/app/panels/timepicker/module.html
index 634f567a692..2978d38ce83 100644
--- a/public/app/panels/timepicker/module.html
+++ b/public/app/panels/timepicker/module.html
@@ -27,15 +27,16 @@
 					<i class="fa fa-caret-down"></i>
 				</a>
 
-				<ul class="dropdown-menu">
+				<!-- lacy load this -->
+				<ul class="dropdown-menu" ng-if="time_options" >
 					<li bindonce ng-repeat='option in time_options'>
 						<a ng-click="setRelativeFilter(option)" bo-text="option.text"></a>
           </li>
 
           <!-- Auto refresh submenu -->
-          <li class="dropdown-submenu">
+					<li class="dropdown-submenu">
             <a href="#">Auto-Refresh</a>
-            <ul class="dropdown-menu">
+            <ul class="dropdown-menu" ng-class="{'dropdown-submenu-left': refreshMenuLeftSide}">
               <li>
                 <a ng-click="timeSrv.set_interval(false)">Off</a>
               </li>
diff --git a/public/app/panels/timepicker/module.js b/public/app/panels/timepicker/module.js
index 6a3555a8c06..aed1c53c356 100644
--- a/public/app/panels/timepicker/module.js
+++ b/public/app/panels/timepicker/module.js
@@ -86,6 +86,8 @@ function (angular, app, _, moment, kbn) {
         }
         return option;
       });
+
+      $scope.refreshMenuLeftSide = $scope.time.rangeString.length < 10;
     };
 
     $scope.customTime = function() {
diff --git a/public/css/less/overrides.less b/public/css/less/overrides.less
index 6ac6a385b60..fb6544cd99c 100644
--- a/public/css/less/overrides.less
+++ b/public/css/less/overrides.less
@@ -583,11 +583,19 @@ code, pre {
 }
 
 .dropdown-menu {
+  min-width: 140px;
   > li > a {
-    padding: 3px 10px;
+    padding: 3px 20px 3px 15px;
     i {
       padding-right: 5px;
       color: @linkColorDisabled;
     }
   }
 }
+
+.dropdown-submenu>.dropdown-menu.dropdown-submenu-left {
+  left: auto;
+  right: 100%;
+  margin-left: 0;
+  margin-right: -1px;
+}