diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js
index 94984977c7a..3bee64ed807 100644
--- a/public/app/directives/variableValueSelect.js
+++ b/public/app/directives/variableValueSelect.js
@@ -30,11 +30,9 @@ function (angular, app, _) {
 
         vm.selectedValues = _.filter(vm.options, {selected: true});
 
-        if (!vm.tags) {
-          vm.tags = _.map(vm.variable.tags, function(value) {
-            return { text: value, selected: false };
-          });
-        }
+        vm.tags = _.map(vm.variable.tags, function(value) {
+          return { text: value, selected: false };
+        });
 
         vm.search = {query: '', options: vm.options};
         vm.dropdownVisible = true;
@@ -225,7 +223,7 @@ function (angular, app, _) {
 
     });
 
-  angular
+    angular
     .module('grafana.directives')
     .directive('variableValueSelect', function($compile, $window, $timeout) {
 
diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less
index dde7dae481a..aba2c97d0a8 100644
--- a/public/css/less/submenu.less
+++ b/public/css/less/submenu.less
@@ -55,14 +55,14 @@
   min-width: 150px;
   max-height: 400px;
   min-height: 150px;
-  background-color: @dropdownBackground;
   overflow-y: auto;
   overflow-x: hidden;
-  box-shadow: 0px 0px 55px 0px black;
-  border: 1px solid @grafanaTargetFuncBackground;
+  background-color: @dropdownBackground;
+  box-shadow: 0 0 25px 0 rgba(0,0,0,0.4);
   z-index: 1000;
   font-size: @baseFontSize;
   border-radius: 3px 3px 0 0;
+  border: 1px solid @grafanaTargetFuncBackground;
 
   &.multi {
    .selected {