diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html
index 2b9f7e1a620..bec7c92b20a 100644
--- a/public/app/plugins/datasource/influxdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html
@@ -55,12 +55,12 @@
 				<metric-segment segment="segment" get-options="getTagsOrValues(segment, $index)" on-change="tagSegmentUpdated(segment, $index)"></metric-segment>
 			</li>
 		</ul>
-		<div class="clearfix"></div>
 
-		<div style="padding: 10px" ng-if="target.rawQuery">
-			<textarea ng-model="target.query" rows="8" spellcheck="false" style="width: 100%; box-sizing: border-box;" ng-blur="get_data()"></textarea>
+		<div class="tight-form-flex-wrapper" ng-show="target.rawQuery">
+			<input type="text" class="tight-form-clear-input" ng-model="target.query" spellcheck="false" style="width: 100%;" ng-blur="get_data()"></input>
 		</div>
 
+		<div class="clearfix"></div>
 	</div>
 
 	<div ng-hide="target.rawQuery">
diff --git a/public/app/plugins/datasource/influxdb/query_ctrl.js b/public/app/plugins/datasource/influxdb/query_ctrl.js
index 52b7e7f1b7a..c3fd9f2db11 100644
--- a/public/app/plugins/datasource/influxdb/query_ctrl.js
+++ b/public/app/plugins/datasource/influxdb/query_ctrl.js
@@ -23,7 +23,6 @@ function (angular, _, InfluxQueryBuilder, InfluxQuery, queryPart) {
       $scope.resultFormats = [
          {text: 'Time series', value: 'time_series'},
          {text: 'Table', value: 'table'},
-         {text: 'JSON field', value: 'json_field'},
       ];
 
       if (!$scope.target.measurement) {
diff --git a/public/less/tightform.less b/public/less/tightform.less
index 494497653ed..757ef2b973c 100644
--- a/public/less/tightform.less
+++ b/public/less/tightform.less
@@ -59,6 +59,11 @@
   }
 }
 
+.tight-form-flex-wrapper {
+  display: flex;
+  flex-direction: row;
+}
+
 .grafana-metric-options {
   margin-top: 25px;
 }