diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html
index c8848d6f43b..3d14b18c81d 100644
--- a/public/app/plugins/datasource/influxdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html
@@ -75,19 +75,19 @@
 		<div class="gf-form-inline">
 			<div class="gf-form">
 				<label class="gf-form-label query-keyword width-7">ORDER BY</label>
-				<label class="gf-form-label query-part">time</label>
+				<label class="gf-form-label query-part width-4">time</label>
 				<div class="gf-form-select-wrapper">
 					<select class="gf-form-input gf-size-auto" ng-model="ctrl.target.orderByTime" ng-options="f.value as f.text for f in ctrl.orderByTime" ng-change="ctrl.refresh()"></select>
 				</div>
 			</div>
-		
-			<div class="gf-form max-width-30">
-				<label class="gf-form-label query-keyword width-7">LIMIT</label>
+
+			<div class="gf-form max-width-14">
+				<label class="gf-form-label query-keyword width-5">LIMIT</label>
 				<input type="text" class="gf-form-input" ng-model="ctrl.target.limit" spellcheck='false' placeholder="No Limit" ng-blur="ctrl.refresh()">
 			</div>
-		
-			<div class="gf-form max-width-30">
-				<label class="gf-form-label query-keyword width-7">SLIMIT</label>
+
+			<div class="gf-form max-width-14">
+				<label class="gf-form-label query-keyword width-5">SLIMIT</label>
 				<input type="text" class="gf-form-input" ng-model="ctrl.target.slimit" spellcheck='false' placeholder="No Limit" ng-blur="ctrl.refresh()">
 			</div>
 			<div class="gf-form gf-form--grow">
diff --git a/public/app/plugins/datasource/influxdb/query_ctrl.ts b/public/app/plugins/datasource/influxdb/query_ctrl.ts
index f78ed0727db..c676c222d94 100644
--- a/public/app/plugins/datasource/influxdb/query_ctrl.ts
+++ b/public/app/plugins/datasource/influxdb/query_ctrl.ts
@@ -34,8 +34,8 @@ export class InfluxQueryCtrl extends QueryCtrl {
       {text: 'Table', value: 'table'},
     ];
     this.orderByTime = [
-      {text: 'Ascending', value: 'ASC'},
-      {text: 'Descending', value: 'DESC'},
+      {text: 'ASC', value: 'ASC'},
+      {text: 'DESC', value: 'DESC'},
     ];
 
     this.policySegment = uiSegmentSrv.newSegment(this.target.policy);