diff --git a/src/module/mb-assets.js b/src/module/mb-assets.js
index 7b8a4d7..42f8fe3 100644
--- a/src/module/mb-assets.js
+++ b/src/module/mb-assets.js
@@ -43,7 +43,6 @@ function _actorDropper(match, options) {
 }
 
 async function _spawnTokens(actor, num) {
-  console.log("SPAWN", num, actor);
   for (let i = 0; i < num; i++) {
     const label =
       num > 1
@@ -82,11 +81,28 @@ function _onClickActorDropperLink(ev) {
   }
 }
 
+Hooks.on("renderApplicationV1", (application, html, data) => {
+  $(html)
+    .find("a.mb-assets-actor-drop-link")
+    .each((i, el) => $(el).click(_onClickActorDropperLink));
+});
+
+Hooks.on("renderApplicationV2", (application, element, context, options) => {
+  element
+    .querySelectorAll("a.mb-assets-actor-drop-link")
+    .forEach((el) => el.addEventListener("click", _onClickActorDropperLink));
+});
+
+Hooks.on("renderChatMessageHTML", (message, html, context) => {
+  html
+    .querySelectorAll("a.mb-assets-actor-drop-link")
+    .forEach((el) => el.addEventListener("click", _onClickActorDropperLink));
+});
+
 Hooks.once("ready", async () => {
   for (const enricher of enrichers) {
     CONFIG.TextEditor.enrichers.push(enricher);
   }
-  document.body.addEventListener("click", _onClickActorDropperLink);
   TokenMagic.importPresetLibraryFromPath(
     "modules/mb-assets/config/tmfx-presets.json",
   );