diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index e8c5985c..841c7af4 100644
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -280,15 +280,17 @@ function Bookmarks() //{{{
             let keyword = "";
             let tags = "";
 
-            let bmark = bookmarks.get(buffer.URL)[0];
-            if (bmark)
+            let bmarks = bookmarks.get(buffer.URL).filter(function (bmark) bmark.url == buffer.URL);
+
+            if (bmarks.length == 1)
             {
+                let bmark = bmarks[0];
+
                 title = " -title=\"" + bmark.title + "\"";
                 if (bmark.keyword)
                     keyword = " -keyword=\"" + bmark.keyword + "\"";
                 if (bmark.tags.length > 0)
                     tags = " -tags=\"" + bmark.tags.join(", ") + "\"";
-
             }
             else
             {