diff --git a/static/js/pandora.js b/static/js/pandora.js
index 5460d30e..8c81b54b 100644
--- a/static/js/pandora.js
+++ b/static/js/pandora.js
@@ -314,18 +314,6 @@ appPanel
             Ox.Theme(pandora.user.ui.theme);
             if (isEmbed) {
                 pandora.$ui.embedPanel = pandora.ui.embedPanel().display();
-                Ox.$parent.onMessage({
-                    settheme: function(data) {
-                        if (Ox.contains(pandora.site.themes, data.theme)) {
-                            Ox.Theme(data.theme);
-                        }
-                    },
-                    seturl: function(data) {
-                        if (pandora.isEmbedURL(data.url)) {
-                            pandora.URL.push(data.url);
-                        }
-                    }
-                });
             } else {
                 pandora.$ui.appPanel = pandora.ui.appPanel().display();
                 Ox.Request.requests() && pandora.$ui.loadingIcon.start();
diff --git a/static/js/pandora/embedPanel.js b/static/js/pandora/embedPanel.js
index f3db5ec5..7ab9421d 100644
--- a/static/js/pandora/embedPanel.js
+++ b/static/js/pandora/embedPanel.js
@@ -391,6 +391,19 @@ pandora.ui.embedPanel = function() {
         pandora_hash: that.reloadPanel
     });
 
+    Ox.$parent.onMessage({
+        settheme: function(data) {
+            if (Ox.contains(pandora.site.themes, data.theme)) {
+                Ox.Theme(data.theme);
+            }
+        },
+        seturl: function(data) {
+            if (pandora.isEmbedURL(data.url)) {
+                pandora.URL.push(data.url);
+            }
+        }
+    });
+
     return that;
 
 };