diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 4c20cc0835c..2467d3040d1 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -209,7 +209,7 @@ function addBookmarkMenuitems()
   var bookmarkCurTabItem = document.createElement("menuitem");
   bookmarkCurTabItem.setAttribute("label", gNavigatorBundle.getString("bookmarkCurTab_label"));
   bookmarkCurTabItem.setAttribute("accesskey", gNavigatorBundle.getString("bookmarkCurTab_accesskey"));
-  bookmarkCurTabItem.setAttribute("oncommand", "addBookmarkAs((getBrowser().mContextTab).linkedBrowser, false);");
+  bookmarkCurTabItem.setAttribute("oncommand", "BookmarkThisTab();");
   var menuseparator = document.createElement("menuseparator");
   var insertPos = tabMenu.lastChild.previousSibling;
   tabMenu.insertBefore(bookmarkAllTabsItem, insertPos);
@@ -217,6 +217,15 @@ function addBookmarkMenuitems()
   tabMenu.insertBefore(menuseparator, bookmarkCurTabItem);
 }
 
+function BookmarkThisTab()
+{
+  var tab = getBrowser().mContextTab;
+  if (tab.localName != "tab")
+    tab = getBrowser().mCurrentTab;
+
+  addBookmarkAs(tab.linkedBrowser, false);
+}
+
 const gSessionHistoryObserver = {
   observe: function(subject, topic, data)
   {