diff --git a/public/app/directives/templateParamSelector.js b/public/app/directives/templateParamSelector.js
index 3d7a9f964d4..629c3ececcc 100644
--- a/public/app/directives/templateParamSelector.js
+++ b/public/app/directives/templateParamSelector.js
@@ -99,12 +99,8 @@ function (angular, app, _) {
           };
 
           scope.updateLinkText = function() {
-            scope.linkText = "";
-            if (!variable.hideLabel) {
-              scope.linkText = (variable.label || variable.name) + ': ';
-            }
-
-            scope.linkText += variable.current.text;
+            scope.labelText = variable.label || '$' + variable.name;
+            scope.linkText = variable.current.text;
           };
 
           scope.$watchGroup(['variable.hideLabel', 'variable.name', 'variable.label', 'variable.current.text'], function() {
diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html
index 1904aa598ee..058500c495c 100644
--- a/public/app/features/dashboard/partials/variableValueSelect.html
+++ b/public/app/features/dashboard/partials/variableValueSelect.html
@@ -1,3 +1,6 @@
+<span class="template-variable" ng-show="!variable.hideLabel" style="padding-right: 5px">
+	{{labelText}}:
+</span>
 <a ng-click="show()" class="variable-value-link">
 	{{linkText}}
 	<i class="fa fa-caret-down"></i>