diff --git a/front_end/host/InspectorFrontendHost.js b/front_end/host/InspectorFrontendHost.js
index fb17722e44..8acac08648 100644
--- a/front_end/host/InspectorFrontendHost.js
+++ b/front_end/host/InspectorFrontendHost.js
@@ -449,15 +449,15 @@ WebInspector.InspectorFrontendHostStub.prototype = {
 /**
  * @type {!InspectorFrontendHostAPI}
  */
-window.InspectorFrontendHost = window.InspectorFrontendHost || null;
-
+var InspectorFrontendHost = window.InspectorFrontendHost || null;
+window.InspectorFrontendHost = InspectorFrontendHost;
 (function(){
 
     function initializeInspectorFrontendHost()
     {
         if (!InspectorFrontendHost) {
             // Instantiate stub for web-hosted mode if necessary.
-            InspectorFrontendHost = new WebInspector.InspectorFrontendHostStub();
+            window.InspectorFrontendHost = InspectorFrontendHost = new WebInspector.InspectorFrontendHostStub();
         } else {
             // Otherwise add stubs for missing methods that are declared in the interface.
             var proto = WebInspector.InspectorFrontendHostStub.prototype;
diff --git a/front_end/host/InspectorFrontendHostAPI.js b/front_end/host/InspectorFrontendHostAPI.js
index 859410ee49..947dd68049 100644
--- a/front_end/host/InspectorFrontendHostAPI.js
+++ b/front_end/host/InspectorFrontendHostAPI.js
@@ -4,10 +4,10 @@
 
 
 /** @interface */
-window.InspectorFrontendHostAPI = function()
+function InspectorFrontendHostAPI()
 {
 }
-
+window.InspectorFrontendHostAPI = InspectorFrontendHostAPI;
 /** @typedef
 {{
     type: string,