diff --git a/browser/base/content/aboutSyncTabs.js b/browser/base/content/aboutSyncTabs.js
index 8acdf7a416d..222548e4ef2 100644
--- a/browser/base/content/aboutSyncTabs.js
+++ b/browser/base/content/aboutSyncTabs.js
@@ -140,7 +140,7 @@ let RemoteTabViewer = {
                                                    , "folderPicker"
                                                    , "loadInSidebar"
                                                    , "keyword" ]
-                                     });
+                                     }, window.top);
   },
 
   bookmarkSelectedTabs: function() {
@@ -160,7 +160,7 @@ let RemoteTabViewer = {
                                        , type: "folder"
                                        , URIList: URIs
                                        , hiddenRows: [ "description" ]
-                                       });
+                                       }, window.top);
     }
   },
 
diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
index 66cf691f2a1..b85892c12cd 100644
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -388,13 +388,13 @@ var PlacesCommandHook = {
                                                      , "loadInSidebar"
                                                      , "folderPicker"
                                                      , "keyword" ]
-                                       });
+                                       }, window);
     }
     else {
       PlacesUIUtils.showBookmarkDialog({ action: "edit"
                                        , type: "bookmark"
                                        , itemId: itemId
-                                       });
+                                       }, window);
     }
   },
 
@@ -427,7 +427,7 @@ var PlacesCommandHook = {
                                      , type: "folder"
                                      , URIList: pages
                                      , hiddenRows: [ "description" ]
-                                     });
+                                     }, window);
     }
   },
 
@@ -478,7 +478,7 @@ var PlacesCommandHook = {
                                      , hiddenRows: [ "feedLocation"
                                                    , "siteLocation"
                                                    , "description" ]
-                                     });
+                                     }, window);
   },
 
   /**
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 91392b7a095..739ac2b295d 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3165,7 +3165,7 @@ var bookmarksButtonObserver = {
                                                      , "loadInSidebar"
                                                      , "folderPicker"
                                                      , "keyword" ]
-                                       });
+                                       }, window);
     } catch(ex) { }
   },
 
@@ -5794,7 +5794,7 @@ function contentAreaClick(event, isPanelClick)
                                                      , "location"
                                                      , "folderPicker"
                                                      , "keyword" ]
-                                       });
+                                       }, window);
       event.preventDefault();
       return true;
     }
@@ -6841,7 +6841,7 @@ function AddKeywordForSearchField() {
                                    , hiddenRows: [ "location"
                                                  , "loadInSidebar"
                                                  , "folderPicker" ]
-                                   });
+                                   }, window);
 }
 
 function SwitchDocumentDirection(aWindow) {
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index a1a03f596cd..d935ce626bd 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -1408,13 +1408,13 @@ nsContextMenu.prototype = {
                                                      , "loadInSidebar"
                                                      , "folderPicker"
                                                      , "keyword" ]
-                                       });
+                                       }, window.top);
     }
     else {
       PlacesUIUtils.showBookmarkDialog({ action: "edit"
                                        , type: "bookmark"
                                        , itemId: itemId
-                                       });
+                                       }, window.top);
     }
   },
 
diff --git a/browser/components/places/content/controller.js b/browser/components/places/content/controller.js
index b07ea098c09..15f8fc0d48b 100644
--- a/browser/components/places/content/controller.js
+++ b/browser/components/places/content/controller.js
@@ -309,10 +309,11 @@ PlacesController.prototype = {
                                        , hiddenRows: [ "description"
                                                      , "keyword"
                                                      , "location"
+                                                     , "folderPicker"
                                                      , "loadInSidebar" ]
                                        , uri: NetUtil.newURI(node.uri)
                                        , title: node.title
-                                       }, window.top, true);
+                                       }, window.top);
       break;
     }
   },
@@ -768,7 +769,7 @@ PlacesController.prototype = {
                                        , type: aType
                                        , defaultInsertionPoint: ip
                                        , hiddenRows: [ "folderPicker" ]
-                                       }, window);
+                                       }, window.top);
     if (performed) {
       // Select the new item.
       let insertedNodeId = PlacesUtils.bookmarks
diff --git a/browser/components/sidebar/src/nsSidebar.js b/browser/components/sidebar/src/nsSidebar.js
index 4cd31b2ba21..e18ed305b99 100644
--- a/browser/components/sidebar/src/nsSidebar.js
+++ b/browser/components/sidebar/src/nsSidebar.js
@@ -111,11 +111,12 @@ function (aTitle, aContentURL, aCustomizeURL, aPersist)
                                          , hiddenRows: [ "description"
                                                        , "keyword"
                                                        , "location"
+                                                       , "folderPicker"
                                                        , "loadInSidebar" ]
                                          , uri: uri
                                          , title: aTitle
                                          , loadBookmarkInSidebar: true
-                                         }, win, true);
+                                         }, win);
 }
 
 nsSidebar.prototype.validateSearchEngine =