diff --git a/js/h5p-x-api.js b/js/h5p-x-api.js
index 14cbb7e..87a6267 100644
--- a/js/h5p-x-api.js
+++ b/js/h5p-x-api.js
@@ -3,10 +3,6 @@ var H5P = H5P || {};
 // Create object where external code may register and listen for H5P Events
 H5P.externalDispatcher = new H5P.EventDispatcher();
 
-if (H5P.isFramed && H5P.externalEmbed === false) {
-  H5P.externalDispatcher.on('*', window.top.H5P.externalDispatcher.trigger);
-}
-
 // EventDispatcher extensions
 
 /**
diff --git a/js/h5p.js b/js/h5p.js
index 9c3dbac..f257f34 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -1747,12 +1747,16 @@ H5P.createTitle = function(rawTitle, maxLength) {
             if (state !== undefined) {
               // Async is not used to prevent the request from being cancelled.
               H5P.setUserData(instance.contentId, 'state', state, {deleteOnChange: true, async: false});
-              
             }
           }
         }
       });
     }
+
+    // Relay events to top window.
+    if (H5P.isFramed && H5P.externalEmbed === false) {
+      H5P.externalDispatcher.on('*', window.top.H5P.externalDispatcher.trigger);
+    }
   });
 
 })(H5P.jQuery);