diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index ffd1673ac63..4b0dba5f682 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -45,15 +45,15 @@ function printDropdownBookmarksList()
 		$tmpurl = '';
 		// No urlencode, all param $url will be urlencoded later
 		if ($sortfield) {
-			$tmpurl .= ($tmpurl ? '&' : '').'sortfield='.$sortfield;
+			$tmpurl .= ($tmpurl ? '&' : '').'sortfield='.urlencode($sortfield);
 		}
 		if ($sortorder) {
-			$tmpurl .= ($tmpurl ? '&' : '').'sortorder='.$sortorder;
+			$tmpurl .= ($tmpurl ? '&' : '').'sortorder='.urlencode($sortorder);
 		}
 		if (is_array($_POST)) {
 			foreach ($_POST as $key => $val) {
 				if (preg_match('/^search_/', $key) && $val != '') {
-					$tmpurl .= ($tmpurl ? '&' : '').$key.'='.$val;
+					$tmpurl .= ($tmpurl ? '&' : '').http_build_query(array($key => $val));
 				}
 			}
 		}