diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 875e1a6b6..94ab2e8f4 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -823,7 +823,7 @@
             if(is_null($url)) {
                 $url = Context::getRequestUri();
                 if(count($_GET)) {
-                    foreach($_GET as $key => $val) $vars[] = $key.'='.$val;
+                    foreach($_GET as $key => $val) $vars[] = $key.'='.urlencode(Context::convertEncodingStr($val));
                     $url .= '?'.implode('&',$vars);
                 }
             }