diff --git a/public/app/plugins/datasource/stackdriver/components/MetricTypePicker.tsx b/public/app/plugins/datasource/stackdriver/components/MetricTypePicker.tsx
deleted file mode 100644
index 9d0ad751c56..00000000000
--- a/public/app/plugins/datasource/stackdriver/components/MetricTypePicker.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React, { SFC } from 'react';
-import { getMetricTypesByService } from '../functions';
-
-interface Props {
-  onMetricTypeChange: any;
-  selectedService: string;
-  selectedMetricType: string;
-  metricDescriptors: any[];
-  metricTypes: any[];
-}
-
-const MetricTypePicker: SFC<Props> = props => {
-  const filterMetricTypes = () => {
-    if (!props.selectedService) {
-      return [];
-    }
-
-    return getMetricTypesByService(props.metricDescriptors, props.selectedService).map(m => ({
-      value: m.type,
-      name: m.displayName,
-    }));
-  };
-
-  return (
-    <div className="gf-form max-width-21">
-      <span className="gf-form-label width-7">Metric Types</span>
-      <div className="gf-form-select-wrapper max-width-14">
-        <select className="gf-form-input" value={props.selectedMetricType} onChange={props.onMetricTypeChange}>
-          {filterMetricTypes().map((qt, i) => (
-            <option key={i} value={qt.value} ng-if="false">
-              {qt.name}
-            </option>
-          ))}
-        </select>
-      </div>
-    </div>
-  );
-};
-
-export default MetricTypePicker;
diff --git a/public/app/plugins/datasource/stackdriver/components/ServicePicker.tsx b/public/app/plugins/datasource/stackdriver/components/ServicePicker.tsx
deleted file mode 100644
index 85320dc3465..00000000000
--- a/public/app/plugins/datasource/stackdriver/components/ServicePicker.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, { SFC } from 'react';
-import { extractServicesFromMetricDescriptors } from '../functions';
-
-interface Props {
-  selectedService: string;
-  onServiceChange: any;
-  metricDescriptors: any[];
-}
-
-const ServicePicker: SFC<Props> = props => {
-  const extractServices = () => {
-    return extractServicesFromMetricDescriptors(props.metricDescriptors).map(m => ({
-      value: m.service,
-      name: m.serviceShortName,
-    }));
-  };
-
-  return (
-    <div className="gf-form max-width-21">
-      <span className="gf-form-label width-7">Service</span>
-      <div className="gf-form-select-wrapper max-width-14">
-        <select className="gf-form-input" required value={props.selectedService} onChange={props.onServiceChange}>
-          {extractServices().map((qt, i) => (
-            <option
-              key={i}
-              value={qt.value}
-              // selected={props.selectedService === qt.value}
-            >
-              {qt.name}
-            </option>
-          ))}
-        </select>
-      </div>
-    </div>
-  );
-};
-
-export default ServicePicker;
diff --git a/public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx b/public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx
index 751cadbf511..311c4c9a149 100644
--- a/public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx
@@ -107,7 +107,7 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
     return [MetricFindQueryTypes.MetricLabels, MetricFindQueryTypes.ResourceLabels].indexOf(queryType) !== -1;
   }
 
-  getDropdown(queryType) {
+  getLabelType(queryType) {
     switch (queryType) {
       case MetricFindQueryTypes.ResourceLabels:
         return (
@@ -146,7 +146,7 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
       case MetricFindQueryTypes.MetricLabels:
       case MetricFindQueryTypes.ResourceLabels:
       case MetricFindQueryTypes.ResourceTypes:
-        const dropdown = this.getDropdown(queryType);
+        const labelSelect = this.getLabelType(queryType);
         return (
           <React.Fragment>
             {this.state.labels.join(',')}
@@ -162,7 +162,7 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
               onValueChange={this.onMetricTypeChange}
               label="Metric Types"
             />
-            {dropdown}
+            {labelSelect}
           </React.Fragment>
         );
       case MetricFindQueryTypes.Alignerns:
@@ -191,23 +191,12 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
   render() {
     return (
       <React.Fragment>
-        <div className="gf-form max-width-21">
-          <span className="gf-form-label width-7">Query Type</span>
-          <div className="gf-form-select-wrapper max-width-14">
-            <select
-              className="gf-form-input"
-              defaultValue={this.state.type}
-              required
-              onChange={this.handleQueryTypeChange}
-            >
-              {this.queryTypes.map((qt, i) => (
-                <option key={i} value={qt.value} ng-if="false">
-                  {qt.name}
-                </option>
-              ))}
-            </select>
-          </div>
-        </div>
+        <KeyValueDropdown
+          value={this.state.type}
+          options={this.queryTypes}
+          onValueChange={this.handleQueryTypeChange}
+          label="Query Types"
+        />
         {this.renderQueryTypeSwitch(this.state.type)}
       </React.Fragment>
     );