diff --git a/classes/Link.php b/classes/Link.php
index 26d9469af..c0aeec7ca 100644
--- a/classes/Link.php
+++ b/classes/Link.php
@@ -382,7 +382,7 @@ class LinkCore
 		if (!is_array($request))
 		{
 			// @FIXME html_entity_decode has been added due to '&' => '%3B' ...
-			$request = html_entity_decode($request);
+			$request = urlencode(html_entity_decode($request));
 			parse_str($request, $request);
 		}
 		unset($request['controller']);