diff --git a/public/app/features/templating/DefaultTemplateQueryComponent.tsx b/public/app/features/templating/DefaultTemplateQueryComponent.tsx
index cd4c5adf157..6d470e8d538 100644
--- a/public/app/features/templating/DefaultTemplateQueryComponent.tsx
+++ b/public/app/features/templating/DefaultTemplateQueryComponent.tsx
@@ -20,7 +20,7 @@ export default class DefaultTemplateQueryComponent extends PureComponent<Templat
   render() {
     return (
       <div className="gf-form">
-        <span className="gf-form-label width-7">Query</span>
+        <span className="gf-form-label width-10">Query</span>
         <input
           type="text"
           className="gf-form-input"
diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index 37a4148c301..d6aabd37225 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -177,7 +177,7 @@
 
 			<div class="gf-form-inline">
 				<div class="gf-form max-width-21">
-					<span class="gf-form-label width-7">Data source</span>
+					<span class="gf-form-label width-10">Data source</span>
 					<div class="gf-form-select-wrapper max-width-14">
 						<select class="gf-form-input" ng-model="current.datasource" ng-options="f.value as f.name for f in datasources"
 						 ng-change="datasourceChanged()" required>
@@ -187,7 +187,7 @@
 				</div>
 
 				<div class="gf-form max-width-22">
-					<span class="gf-form-label width-7">
+					<span class="gf-form-label width-10">
 						Refresh
 						<info-popover mode="right-normal">
 							When to update the values of this variable.
@@ -205,7 +205,7 @@
 			</rebuild-on-change>
 
 			<div class="gf-form">
-				<span class="gf-form-label width-7">
+				<span class="gf-form-label width-10">
 					Regex
 					<info-popover mode="right-normal">
 						Optional, if you want to extract part of a series name or metric node segment.
@@ -215,7 +215,7 @@
 				 ng-change="runQuery()"></input>
 			</div>
 			<div class="gf-form max-width-21">
-				<span class="gf-form-label width-7">
+				<span class="gf-form-label width-10">
 					Sort
 					<info-popover mode="right-normal">
 						How to sort the values of this variable.
diff --git a/public/app/plugins/datasource/stackdriver/components/SimpleSelect.tsx b/public/app/plugins/datasource/stackdriver/components/SimpleSelect.tsx
index 27ae63ace6d..e6f53e6c1fc 100644
--- a/public/app/plugins/datasource/stackdriver/components/SimpleSelect.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/SimpleSelect.tsx
@@ -11,8 +11,8 @@ const SimpleSelect: SFC<Props> = props => {
   const { label, onValueChange, value, options } = props;
   return (
     <div className="gf-form max-width-21">
-      <span className="gf-form-label width-7">{label}</span>
-      <div className="gf-form-select-wrapper max-width-14">
+      <span className="gf-form-label width-10">{label}</span>
+      <div className="gf-form-select-wrapper max-width-10">
         <select className="gf-form-input" required onChange={onValueChange} value={value}>
           {options.map(({ value, name }, i) => (
             <option key={i} value={value}>