diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js
index 66a5e3480a6cd60a1c4f5f7350e4dbd87f960a5f..12470675be6ff8d9bf841c1c932bfdc65ae6bac1 100644
--- a/plugins/SegmentEditor/javascripts/Segmentation.js
+++ b/plugins/SegmentEditor/javascripts/Segmentation.js
@@ -1276,7 +1276,7 @@ $(document).ready(function() {
                     if (segmentDefinition !== $search.segment) {
                         // eg when using back button the date might be actually already changed in the URL and we do not
                         // want to change the URL again
-                        $search.segment = segmentDefinition;
+                        $search.segment = segmentDefinition.replace(/%$/, '%25').replace(/%([^\d].)/g, "%25$1");
                         $location.search($search);
                         setTimeout(function () {
                             try {