diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html
index 7942952f48f..01b541cee72 100644
--- a/public/app/plugins/datasource/influxdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html
@@ -1,6 +1,6 @@
 <query-editor-row ctrl="ctrl">
 		<div ng-hide="ctrl.target.rawQuery" class="gf-form-inline">
-			<label class="gf-form-label query-keyword width-6">FROM</label>
+			<label class="gf-form-label query-keyword width-7">FROM</label>
 
 			<metric-segment segment="ctrl.policySegment" get-options="ctrl.getPolicySegments()" on-change="ctrl.policyChanged()"></metric-segment>
 			<metric-segment segment="ctrl.measurementSegment" get-options="ctrl.getMeasurements()" on-change="ctrl.measurementChanged()"></metric-segment>
@@ -22,7 +22,7 @@
 <div ng-hide="ctrl.target.rawQuery">
 	<div class="gf-form-inline query-editor-secondary-row" ng-repeat="selectParts in ctrl.queryModel.selectModels">
 		<div class="gf-form">
-			<label class="gf-form-label query-keyword width-6">
+			<label class="gf-form-label query-keyword width-7">
 				<span ng-show="$index === 0">SELECT</span>
 			</label>
 
@@ -39,6 +39,23 @@
 				dropdown-typeahead="ctrl.selectMenu"
 				dropdown-typeahead-on-select="ctrl.addSelectPart(selectParts, $item, $subItem)">
 			</label>
+		</div>
+	</div>
+	<div class="gf-form-inline query-editor-secondary-row">
+		<div class="gf-form">
+			<label class="gf-form-label query-keyword width-7">
+				<span>GROUP BY</span>
+			</label>
+
+
+			<influx-query-part-editor
+					ng-repeat="part in ctrl.queryModel.groupByParts"
+					part="part"
+					class="gf-form-label tight-form-func"
+					remove-action="ctrl.removeGroupByPart(part, $index)" part-updated="ctrl.refresh();" get-options="ctrl.getPartOptions(part)">
+			</influx-query-part-editor>
+
+			<metric-segment segment="ctrl.groupBySegment" get-options="ctrl.getGroupByOptions()" on-change="ctrl.groupByAction(part, $index)"></metric-segment>
 	</div>
 </div>
 
@@ -75,7 +92,7 @@
 
 <div class="gf-form-inline query-editor-secondary-row">
 	<div class="gf-form max-width-30">
-		<label class="gf-form-label query-keyword">ALIAS BY</label>
+		<label class="gf-form-label query-keyword width-7">ALIAS BY</label>
 		<input type="text" class="gf-form-input" ng-model="ctrl.target.alias" spellcheck='false' placeholder="Naming pattern" ng-blur="ctrl.refresh()">
 	</div>
 	<div class="gf-form">