diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index 53f752a12ca..cd3208819b1 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -6411,10 +6411,10 @@ var PlacesCommandHook = {
     var currentURI = getBrowser().selectedBrowser.webNavigation.currentURI;
     var bms = PlacesController.bookmarks;
     if (bms.isBookmarked(currentURI)) {
-      this.showBookmarkProperties();
+      PlacesController.showBookmarkProperties(currentURI);
     } else {
       bms.insertItem(bms.bookmarksRoot, currentURI, -1);
-      this._updateControlStates();
+      this.updateTagButton();
     }
   }
 };
diff --git a/mozilla/browser/components/places/content/controller.js b/mozilla/browser/components/places/content/controller.js
index 1e43a1c87d7..7e5bac40e34 100755
--- a/mozilla/browser/components/places/content/controller.js
+++ b/mozilla/browser/components/places/content/controller.js
@@ -832,10 +832,9 @@ var PlacesController = {
     if (!this.bookmarks.isBookmarked(bookmarkURI))
       return;
 
-    var view = this._activeView.browserWindow;
-    view.openDialog("chrome://browser/content/places/bookmarkProperties.xul",
-                    "", "width=600,height=400,chrome,dependent,modal,resizable",
-                    bookmarkURI, this);
+    window.openDialog("chrome://browser/content/places/bookmarkProperties.xul",
+                      "", "width=600,height=400,chrome,dependent,modal,resizable",
+                      bookmarkURI, this);
   },
 
   /**