diff --git a/src/app/directives/grafanaGraph.js b/src/app/directives/grafanaGraph.js
old mode 100644
new mode 100755
index d5a44598ad0..7a47983bd60
--- a/src/app/directives/grafanaGraph.js
+++ b/src/app/directives/grafanaGraph.js
@@ -313,7 +313,7 @@ function (angular, $, kbn, moment, _) {
             if (seriesInfo.alias) {
               group = '<small style="font-size:0.9em;">' +
                 '<i class="icon-circle" style="color:'+item.series.color+';"></i>' + ' ' +
-                (seriesInfo.alias || seriesInfo.query)+
+                (decodeURIComponent(seriesInfo.alias) || seriesInfo.query)+
               '</small><br>';
             } else {
               group = kbn.query_color_dot(item.series.color, 15) + ' ';
diff --git a/src/app/filters/all.js b/src/app/filters/all.js
old mode 100644
new mode 100755
index e4ffe7088c8..9a717cc53a8
--- a/src/app/filters/all.js
+++ b/src/app/filters/all.js
@@ -114,4 +114,10 @@ define(['angular', 'jquery', 'underscore', 'moment'], function (angular, $, _, m
     };
   });
 
+  module.filter('urlDecode', function() {
+    return function(input) {
+      return decodeURIComponent(input);
+    };
+ });
+
 });
\ No newline at end of file
diff --git a/src/app/panels/filtering/module.html b/src/app/panels/filtering/module.html
old mode 100644
new mode 100755
index a360161aa83..6f8dd5d79fb
--- a/src/app/panels/filtering/module.html
+++ b/src/app/panels/filtering/module.html
@@ -17,7 +17,7 @@
             </a>
               <ul class="dropdown-menu">
                 <li ng-repeat="option in filter.options">
-                  <a ng-click="filterOptionSelected(filter, option)">{{option.text}}</a>
+                  <a ng-click="filterOptionSelected(filter, option)">{{option.text | urlDecode}}</a>
                 </li>
               </ul>
           </li>
diff --git a/src/app/panels/graphite/legend.html b/src/app/panels/graphite/legend.html
old mode 100644
new mode 100755
index 84aab5020f6..013b50a5c95
--- a/src/app/panels/graphite/legend.html
+++ b/src/app/panels/graphite/legend.html
@@ -9,7 +9,7 @@
     </i>
     <span class='small histogram-legend-item'>
       <a ng-click="toggleSeries(series, $event)" data-unique="1" data-placement="{{series.yaxis === 2 ? 'bottomRight' : 'bottomLeft'}}">
-        {{series.alias}}
+        {{series.alias | urlDecode }}
       </a>
       <span ng-if="panel.legend.values">
         <span ng-show="panel.legend.current">
diff --git a/src/app/partials/graphite/editor.html b/src/app/partials/graphite/editor.html
old mode 100644
new mode 100755
index 48179eccacf..3503680b424
--- a/src/app/partials/graphite/editor.html
+++ b/src/app/partials/graphite/editor.html
@@ -70,7 +70,7 @@
           </a>
           <ul class="dropdown-menu scrollable grafana-segment-dropdown-menu" role="menu">
             <li ng-repeat="altSegment in altSegments" role="menuitem">
-              <a href="javascript:void(0)" tabindex="1" ng-click="setSegment($index, $parent.$index)" ng-bind-html-unsafe="altSegment.html"></a>
+              <a href="javascript:void(0)" tabindex="1" ng-click="setSegment($index, $parent.$index)" ng-bind-html-unsafe="altSegment.html | urlDecode"></a>
             </li>
           </ul>
         </li>