diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html
index 1ae2c037758..379bbf76a27 100644
--- a/public/app/plugins/datasource/influxdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html
@@ -15,18 +15,10 @@
 						<i class="fa fa-bars"></i>
 					</a>
 					<ul class="dropdown-menu pull-right" role="menu">
-						<a tabindex="1" ng-click="toggleEditorMode()">
-							Switch editor mode
-						</a>
-						<li role="menuitem">
-							<a tabindex="1" ng-click="duplicate()">Duplicate</a>
-						</li>
-						<li role="menuitem">
-							<a tabindex="1" ng-click="moveMetricQuery($index, $index-1)">Move up</a>
-						</li>
-						<li role="menuitem">
-							<a tabindex="1" ng-click="moveMetricQuery($index, $index+1)">Move down</a>
-						</li>
+						<li role="menuitem"><a tabindex="1" ng-click="toggleQueryMode()">Switch editor mode</a></li>
+						<li role="menuitem"><a tabindex="1" ng-click="duplicate()">Duplicate</a></li>
+						<li role="menuitem"><a tabindex="1" ng-click="moveMetricQuery($index, $index-1)">Move up</a></li>
+						<li role="menuitem"><a tabindex="1" ng-click="moveMetricQuery($index, $index+1)">Move down</a></li>
 					</ul>
 				</div>
 			</li>
diff --git a/public/app/plugins/datasource/influxdb_08/partials/query.editor.html b/public/app/plugins/datasource/influxdb_08/partials/query.editor.html
index b6f171715b1..9c162741896 100644
--- a/public/app/plugins/datasource/influxdb_08/partials/query.editor.html
+++ b/public/app/plugins/datasource/influxdb_08/partials/query.editor.html
@@ -1,16 +1,16 @@
 <div class="tight-form">
 	<ul class="tight-form-list pull-right">
+		<li class="tight-form-item small" ng-show="target.datasource">
+			<em>{{target.datasource}}</em>
+		</li>
 		<li class="tight-form-item">
 			<div class="dropdown">
-				<a class="pointer dropdown-toggle"
-					data-toggle="dropdown"
-					tabindex="1">
+				<a class="pointer dropdown-toggle" data-toggle="dropdown" tabindex="1">
 					<i class="fa fa-bars"></i>
 				</a>
 				<ul class="dropdown-menu pull-right" role="menu">
+					<li role="menuitem"><a tabindex="1" ng-click="toggleQueryMode()">Switch editor mode</a></li>
 					<li role="menuitem"><a tabindex="1" ng-click="duplicate()">Duplicate</a></li>
-					<li role="menuitem"><a tabindex="1" ng-click="showQuery()" ng-hide="target.rawQuery">Raw query mode</a></li>
-					<li role="menuitem"><a tabindex="1" ng-click="hideQuery()" ng-show="target.rawQuery">Query editor mode</a></li>
 					<li role="menuitem"><a tabindex="1" ng-click="moveMetricQuery($index, $index-1)">Move up </a></li>
 					<li role="menuitem"><a tabindex="1" ng-click="moveMetricQuery($index, $index+1)">Move down</a></li>
 				</ul>
@@ -35,19 +35,13 @@
 	</ul>
 
 	<!-- Raw Query mode  -->
-	<ul class="tight-form-list" ng-show="target.rawQuery">
-		<li>
-			<input type="text"
-			class="tight-form-input span10"
-			ng-model="target.query"
-			placeholder="select ..."
-			give-focus="target.rawQuery"
-			spellcheck='false'
-			data-min-length=0 data-items=100
-			ng-model-onblur
-			ng-blur="get_data()">
-		</li>
-	</ul>
+	<input type="text" class="tight-form-clear-input" style="width: 80%" ng-model="target.query"
+	placeholder="select ..." ng-show="target.rawQuery"
+	give-focus="target.rawQuery"
+	spellcheck='false'
+	data-min-length=0 data-items=100
+	ng-model-onblur
+	ng-blur="get_data()"></input>
 
 	<!-- Query editor mode -->
 	<ul class="tight-form-list" role="menu" ng-hide="target.rawQuery">
diff --git a/public/app/plugins/datasource/influxdb_08/queryCtrl.js b/public/app/plugins/datasource/influxdb_08/queryCtrl.js
index ee03a61389c..0cb6b49e993 100644
--- a/public/app/plugins/datasource/influxdb_08/queryCtrl.js
+++ b/public/app/plugins/datasource/influxdb_08/queryCtrl.js
@@ -30,8 +30,6 @@ function (angular, _) {
         delete target.groupby_field_add;
       }
 
-      $scope.rawQuery = false;
-
       $scope.functions = [
         'count', 'mean', 'sum', 'min',
         'max', 'mode', 'distinct', 'median',
@@ -46,12 +44,8 @@ function (angular, _) {
       });
     };
 
-    $scope.showQuery = function () {
-      $scope.target.rawQuery = true;
-    };
-
-    $scope.hideQuery = function () {
-      $scope.target.rawQuery = false;
+    $scope.toggleQueryMode = function () {
+      $scope.target.rawQuery = !$scope.target.rawQuery;
     };
 
     // Cannot use typeahead and ng-change on blur at the same time
diff --git a/public/app/plugins/datasource/kairosdb/partials/query.editor.html b/public/app/plugins/datasource/kairosdb/partials/query.editor.html
index 515b54c34bf..7fd1d6527fe 100644
--- a/public/app/plugins/datasource/kairosdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/kairosdb/partials/query.editor.html
@@ -1,5 +1,8 @@
 <div class="tight-form">
 	<ul class="tight-form-list pull-right">
+		<li class="tight-form-item small" ng-show="target.datasource">
+			<em>{{target.datasource}}</em>
+		</li>
 		<li class="tight-form-item">
 			<div class="dropdown">
 				<a  class="pointer dropdown-toggle" data-toggle="dropdown" tabindex="1">
diff --git a/public/app/plugins/datasource/opentsdb/partials/query.editor.html b/public/app/plugins/datasource/opentsdb/partials/query.editor.html
index 2a733393842..9af1523e780 100644
--- a/public/app/plugins/datasource/opentsdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/opentsdb/partials/query.editor.html
@@ -1,16 +1,16 @@
 <div class="tight-form">
 	<ul class="tight-form-list pull-right">
+		<li class="tight-form-item small" ng-show="target.datasource">
+			<em>{{target.datasource}}</em>
+		</li>
 		<li class="tight-form-item">
 			<div class="dropdown">
-				<a  class="pointer dropdown-toggle"
-					data-toggle="dropdown"
-					tabindex="1">
+				<a class="pointer dropdown-toggle" data-toggle="dropdown" tabindex="1">
 					<i class="fa fa-bars"></i>
 				</a>
 				<ul class="dropdown-menu pull-right" role="menu">
 					<li role="menuitem">
-						<a  tabindex="1"
-							ng-click="duplicate()">
+						<a tabindex="1" ng-click="duplicate()">
 							Duplicate
 						</a>
 					</li>