diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 6b1978544..e055f320a 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -1289,10 +1289,14 @@ class Context
 			{
 				$result[$k] = !preg_match('/^[0-9,]+$/', $v) ? (int) $v : $v;
 			}
-			elseif($key === 'mid' || $key === 'vid' || $key === 'search_keyword')
+			elseif($key === 'mid' || $key === 'search_keyword')
 			{
 				$result[$k] = htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 			}
+			elseif($key === 'vid')
+			{
+				$result[$k] = urlencode($v);
+			}
 			else
 			{
 				$result[$k] = $v;