--- a/suite/base/content/nsContextMenu.js
+++ b/suite/base/content/nsContextMenu.js
@@ -1060,17 +1060,23 @@ nsContextMenu.prototype = {
 
   printFrame: function() {
     PrintUtils.printWindow(gContextMenuContentData.frameOuterWindowID,
                            this.browser);
   },
 
   // Open clicked-in frame in the same window
   showOnlyThisFrame: function() {
-    openTopWin( this.target.ownerDocument.location.href, this.target.ownerDocument.defaultView );
+    urlSecurityCheck(gContextMenuContentData.docLocation,
+                     this.principal,
+                     Ci.nsIScriptSecurityManager.DISALLOW_SCRIPT);
+    let referrer = gContextMenuContentData.referrer;
+    openUILinkIn(gContextMenuContentData.docLocation, "current",
+                 { disallowInheritPrincipal: true,
+                   referrerURI: referrer ? makeURI(referrer) : null });
   },
 
   // View Partial Source
   viewPartialSource: function(aContext) {
     var browser = getBrowser().selectedBrowser;
     var target = aContext == "mathml" ? this.target : null;
     gViewSourceUtils.viewPartialSourceInBrowser(browser, target, null);
   },

--- a/suite/base/content/viewApplyThemeOverlay.js
+++ b/suite/base/content/viewApplyThemeOverlay.js
@@ -32,28 +32,28 @@ var gAddonListener = {
   onUninstalled: reloadThemes,
   onOperationCancelled: reloadThemes
 };
 
 function getNewThemes()
 {
   // get URL for more themes from prefs
   try {
-    openTopWin(Services.urlFormatter.formatURLPref("extensions.getMoreThemesURL"));
+    openURL(Services.urlFormatter.formatURLPref("extensions.getMoreThemesURL"));
   }
   catch (e) {
     dump(e);
   }
 }
 
 function getPersonas()
 {
   // get URL for more themes from prefs
   try {
-    openTopWin(Services.urlFormatter.formatURLPref("extensions.getPersonasURL"));
+    openURL(Services.urlFormatter.formatURLPref("extensions.getPersonasURL"));
   }
   catch (e) {
     dump(e);
   }
 }
 
 function checkTheme(popup)
 {