diff --git a/manifest.json b/manifest.json
index 3d9131f..15c4910 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,7 @@
 {
   "requiredSdkVersion": "~0.0.59",
   "name": "PinMessagePlugin",
+  "version": "0.1.0",
   "javascriptEntrypointUrl": "PinMessagePlugin.js",
   "localesBaseUrl": "https://cdn.dominio.com/pluginabc/",
   "eventPersistence": {
diff --git a/src/plugin-test/component.tsx b/src/plugin-test/component.tsx
index 810334d..c2093b7 100644
--- a/src/plugin-test/component.tsx
+++ b/src/plugin-test/component.tsx
@@ -215,19 +215,21 @@ function PluginPinMessage(
     }
 
     chatMessagesDomElements?.map((chatMessageDomElement) => {
+      const chatMessageContainerDomElement = chatMessageDomElement.parentElement;
+
       // only append if the button is not already there
-      const codeButton = chatMessageDomElement.querySelector('.btn-pin');
+      const codeButton = chatMessageContainerDomElement.querySelector('.btn-pin');
       if (codeButton) {
         return false;
       }
 
-      const toolbar = chatMessageDomElement.querySelector('.chat-message-toolbar');
+      const toolbar = chatMessageContainerDomElement.querySelector('.chat-message-toolbar');
       if (toolbar === null) {
         return false;
       }
 
       // check if the message is pinned
-      const messageId = chatMessageDomElement.dataset.chatMessageId;
+      const messageId = chatMessageContainerDomElement.dataset.chatMessageId;
       const isPinned = pinnedMessageId === messageId;
 
       if (isPinned) {