diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 9f894b84e..603cb067f 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -162,7 +162,7 @@
                 if($this->get_vars) {
                     foreach($this->get_vars as $key => $val) {
                         if(!$val) continue;
-                        $url .= ($url?'&':'').$key.'='.$val;
+                        $url .= ($url?'&':'').$key.'='.urlencode($val);
                     }
                     Context::set('current_url',sprintf('%s?%s', $this->getRequestUri(), $url));
                 } else {