diff --git a/public/app/core/components/form_dropdown/form_dropdown.ts b/public/app/core/components/form_dropdown/form_dropdown.ts
index b1cbd9b6ced..331a7381523 100644
--- a/public/app/core/components/form_dropdown/form_dropdown.ts
+++ b/public/app/core/components/form_dropdown/form_dropdown.ts
@@ -159,6 +159,8 @@ export class FormDropdownCtrl {
   }
 
   updateValue(text) {
+    text = _.unescape(text);
+
     if (text === '' || this.text === text) {
       return;
     }
diff --git a/public/app/core/directives/metric_segment.js b/public/app/core/directives/metric_segment.js
index 37352556819..43409d414b0 100644
--- a/public/app/core/directives/metric_segment.js
+++ b/public/app/core/directives/metric_segment.js
@@ -39,6 +39,8 @@ function (_, $, coreModule) {
             return;
           }
 
+          value = _.unescape(value)
+
           $scope.$apply(function() {
             var selected = _.find($scope.altSegments, {value: value});
             if (selected) {