diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index 28bd56cd..d929b830 100644
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -739,7 +739,7 @@ function Bookmarks() //{{{
                 if (!shortcutURL)
                     return [url, null];
 
-                let data = unescape(postData || "");
+                let data = window.unescape(postData || "");
                 if (/%s/i.test(shortcutURL) || /%s/i.test(data))
                 {
                     var charset = "";
@@ -764,9 +764,7 @@ function Bookmarks() //{{{
                         postData = window.getPostDataStream(data, param, encodedParam, "application/x-www-form-urlencoded");
                 }
                 else if (param)
-                {
-                    return [url, null];
-                }
+                    return [shortcutURL, null];
                 return [shortcutURL, postData];
             }
 
diff --git a/common/content/ui.js b/common/content/ui.js
index caa46a88..028a8be1 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -2140,10 +2140,7 @@ function StatusLine() //{{{
             // ripped from Firefox; modified
             function losslessDecodeURI(url) {
                 // 1. decodeURI decodes %25 to %, which creates unintended
-                //    encoding sequences. Re-encode it, unless it's part of
-                //    a sequence that survived decodeURI, i.e. one for:
-                //    ';', '/', '?', ':', '@', '&', '=', '+', '$', ',', '#'
-                //    (RFC 3987 section 3.2)
+                //    encoding sequences.
                 url = url.split("%25").map(decodeURI).join("%25");
                 // 2. Re-encode whitespace so that it doesn't get eaten away
                 //    by the location bar (bug 410726).