--- a/browser/components/uitour/content-UITour.js
+++ b/browser/components/uitour/content-UITour.js
@@ -51,18 +51,19 @@ var UITourListener = {
 
     if (!allowedSchemes.has(aURI.scheme))
       return false;
 
     return true;
   },
 
   ensureTrustedOrigin: function() {
-    if (content.top != content)
-      return false;
+// This won't actually need to land after deps. are fixed.
+//    if (content.top != content)
+//      return false;
 
     let uri = content.document.documentURIObject;
 
     if (uri.schemeIs("chrome"))
       return true;
 
     if (!this.isSafeScheme(uri))
       return false;

--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -2083,16 +2083,18 @@ var gDiscoverView = {
       return;
     }
 
     this.node = document.getElementById("discover-view");
     this._loading = document.getElementById("discover-loading");
     this._error = document.getElementById("discover-error");
     this._browser = document.getElementById("discover-browser");
 
+    this._browser.messageManager.loadFrameScript("chrome://browser/content/content-UITour.js", true); // TODO: can't depend on browser/ from toolkit/
+
     let compatMode = "normal";
     if (!AddonManager.checkCompatibility)
       compatMode = "ignore";
     else if (AddonManager.strictCompatibility)
       compatMode = "strict";
 
     var url = Services.prefs.getCharPref(PREF_DISCOVERURL);
     url = url.replace("%COMPATIBILITY_MODE%", compatMode);

--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/extensions/content/extensions.xul
@@ -184,17 +184,17 @@
                   <description class="discover-description">&discover.description2;</description>
                   <description class="discover-footer">&discover.footer;</description>
                 </vbox>
               </hbox>
               <spacer class="discover-spacer-after"/>
             </hbox>
             <spacer class="alert-spacer-after"/>
           </vbox>
-          <browser id="discover-browser" type="content" flex="1"
+          <browser id="discover-browser" type="content" flex="1" forcemessagemanager="true"
                      disablehistory="true" homepage="about:blank"/>
         </deck>
 
         <!-- container for views with the search/tools header -->
         <vbox id="headered-views" flex="1">
           <!-- main header -->
           <hbox id="header" align="center">
             <button id="show-all-extensions" hidden="true"