diff --git a/packages/panel/src/components/Panel.svelte b/packages/panel/src/components/Panel.svelte
index 7badb3dcb9..e4c8d21696 100644
--- a/packages/panel/src/components/Panel.svelte
+++ b/packages/panel/src/components/Panel.svelte
@@ -197,10 +197,12 @@
     <div class="popupPanel-body__mobile-content clear-mins" class:max={useMaxWidth}>
       <slot />
       {#if !withoutActivity}
-        <Component
-          is={activity.component.Activity}
-          props={{ object, showCommenInput: !withoutInput, shouldScroll: embedded, focusIndex: 1000 }}
-        />
+        {#key object._id}
+          <Component
+            is={activity.component.Activity}
+            props={{ object, showCommenInput: !withoutInput, shouldScroll: embedded, focusIndex: 1000 }}
+          />
+        {/key}
       {/if}
     </div>
   {:else}
@@ -215,10 +217,12 @@
       <div class="popupPanel-body__main-content py-8 clear-mins" class:max={useMaxWidth}>
         <slot />
         {#if !withoutActivity}
-          <Component
-            is={activity.component.Activity}
-            props={{ object, showCommenInput: !withoutInput, shouldScroll: embedded, focusIndex: 1000 }}
-          />
+          {#key object._id}
+            <Component
+              is={activity.component.Activity}
+              props={{ object, showCommenInput: !withoutInput, shouldScroll: embedded, focusIndex: 1000 }}
+            />
+          {/key}
         {/if}
       </div>
     </Scroller>
diff --git a/plugins/attachment-resources/src/components/AttachmentPresenter.svelte b/plugins/attachment-resources/src/components/AttachmentPresenter.svelte
index 83a962fa66..9f05943381 100644
--- a/plugins/attachment-resources/src/components/AttachmentPresenter.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentPresenter.svelte
@@ -22,6 +22,7 @@
 
   export let value: Attachment
   export let removable: boolean = false
+  export let showPreview = false
 
   const dispatch = createEventDispatcher()
 
@@ -91,17 +92,20 @@
     on:click={clickHandler}
     on:mousedown={middleClickHandler}
   >
-    <!-- <div
-      class="flex-center icon"
-      class:svg={value.type === 'image/svg+xml'}
-      class:image={isImage(value.type)}
-      style={imgStyle}
-    >
-      {#if !isImage(value.type)}{iconLabel(value.name)}{/if}
-    </div> -->
-    <div class="flex-center icon">
-      {iconLabel(value.name)}
-    </div>
+    {#if showPreview}
+      <div
+        class="flex-center icon"
+        class:svg={value.type === 'image/svg+xml'}
+        class:image={isImage(value.type)}
+        style={imgStyle}
+      >
+        {#if !isImage(value.type)}{iconLabel(value.name)}{/if}
+      </div>
+    {:else}
+      <div class="flex-center icon">
+        {iconLabel(value.name)}
+      </div>
+    {/if}
   </a>
   <div class="flex-col info-container">
     <div class="name">
diff --git a/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte b/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte
index 479b7fae0e..946aa6ce31 100644
--- a/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte
@@ -379,6 +379,7 @@
             <AttachmentPresenter
               value={attachment}
               removable
+              showPreview
               on:remove={(result) => {
                 if (result !== undefined) removeAttachment(attachment)
               }}