Merge branch 'refs/heads/ninja-internal' into WebGLMaterials

1 files changed, 3 insertions, 1 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 7491ef9f..fa611de4 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -85,7 +85,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     handleAppLoaded: {
         value: function() {
             //Adding an intercept to resources loaded to ensure user assets load from cloud simulator
-            chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]);
+            if (window.chrome.app.isInstalled) {
+                chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]);
+            }
         }
     },
         ////////////////////////////////////////////////////////////////////