diff --git a/build/index.php b/build/index.php
index f2655a6..e9973aa 100755
--- a/build/index.php
+++ b/build/index.php
@@ -1277,7 +1277,7 @@ class page_renderer
 			else
 			{
 				// Output the item as a link to a url
-				$result .= "<span><a href='" . str_replace("{page}", $env->page, $item[1]) . "'>$item[0]</a></span>";
+				$result .= "<span><a href='" . str_replace("{page}", rawurlencode($env->page), $item[1]) . "'>$item[0]</a></span>";
 			}
 		}
 
diff --git a/core.php b/core.php
index c091b70..f53f744 100644
--- a/core.php
+++ b/core.php
@@ -976,7 +976,7 @@ class page_renderer
 			else
 			{
 				// Output the item as a link to a url
-				$result .= "<span><a href='" . str_replace("{page}", $env->page, $item[1]) . "'>$item[0]</a></span>";
+				$result .= "<span><a href='" . str_replace("{page}", rawurlencode($env->page), $item[1]) . "'>$item[0]</a></span>";
 			}
 		}