diff --git a/js/bookmarks.js b/js/bookmarks.js
index 8d1a8aa6..f3b4098d 100644
--- a/js/bookmarks.js
+++ b/js/bookmarks.js
@@ -158,9 +158,9 @@ function updateBookmarksList(bookmark) {
 				'</span>&nbsp;' +
 			'</p>' +
 			'<p class="bookmark_title">'+
-				'<a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a>' +
+				'<a href="' + encodeURI(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a>' +
 			'</p>' +
-			'<p class="bookmark_url"><a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.url) + '</a></p>' +
+			'<p class="bookmark_url"><a href="' + encodeURI(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeURI(bookmark.url) + '</a></p>' +
 		'</div>'
 	);
 	if(taglist != '') {