diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js
index 2ddb0dd932c..94984977c7a 100644
--- a/public/app/directives/variableValueSelect.js
+++ b/public/app/directives/variableValueSelect.js
@@ -93,7 +93,7 @@ function (angular, app, _) {
 
         tagValuesPromise.then(function(values) {
           tag.values = values;
-          tag.valuesText = values.join(', ');
+          tag.valuesText = values.join(' + ');
           _.each(vm.options, function(option) {
             if (_.indexOf(tag.values, option.value) !== -1) {
               option.selected = tag.selected;
diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html
index 25d220ab3a5..2c291448573 100644
--- a/public/app/features/dashboard/partials/variableValueSelect.html
+++ b/public/app/features/dashboard/partials/variableValueSelect.html
@@ -1,9 +1,11 @@
 <div class="variable-link-wrapper">
 	<a ng-click="vm.show()" class="variable-value-link tight-form-item">
 		{{vm.linkText}}
-		<span class="label-tag" ng-repeat="tag in vm.selectedTags" tag-color-from-name="tag.text">
-			&nbsp;&nbsp;<i class="fa fa-tag"></i>&nbsp;
-			{{tag.text}}
+		<span ng-repeat="tag in vm.selectedTags" bs-tooltip='tag.valuesText' data-placement="bottom">
+			<span class="label-tag"tag-color-from-name="tag.text">
+				&nbsp;&nbsp;<i class="fa fa-tag"></i>&nbsp;
+				{{tag.text}}
+			</span>
 		</span>
 		<i class="fa fa-caret-down"></i>
 	</a>