diff --git a/build/index.php b/build/index.php
index 10d3c70..ccb54e8 100755
--- a/build/index.php
+++ b/build/index.php
@@ -1311,7 +1311,8 @@ class page_renderer
 		$result = "<datalist id='allpages'>\n";
 		foreach($arrayPageIndex as $pagename => $pagedetails)
 		{
-			$result .= "\t\t\t<option value='$pagename' />\n";
+			$escapedPageName = str_replace('"', '&quot;', $pagename);
+			$result .= "\t\t\t<option value=\"$escapedPageName\" />\n";
 		}
 		$result .= "\t\t</datalist>";
 
diff --git a/core.php b/core.php
index 7e9abf9..0636d1c 100644
--- a/core.php
+++ b/core.php
@@ -1004,7 +1004,8 @@ class page_renderer
 		$result = "<datalist id='allpages'>\n";
 		foreach($arrayPageIndex as $pagename => $pagedetails)
 		{
-			$result .= "\t\t\t<option value='$pagename' />\n";
+			$escapedPageName = str_replace('"', '&quot;', $pagename);
+			$result .= "\t\t\t<option value=\"$escapedPageName\" />\n";
 		}
 		$result .= "\t\t</datalist>";