diff --git a/packages/text-editor/src/components/StyledTextBox.svelte b/packages/text-editor/src/components/StyledTextBox.svelte
index ad54c96603..0c97bbfd39 100644
--- a/packages/text-editor/src/components/StyledTextBox.svelte
+++ b/packages/text-editor/src/components/StyledTextBox.svelte
@@ -69,7 +69,10 @@
 
   $: if (oldContent !== content) {
     oldContent = content
-    rawValue = content
+    if (rawValue !== content) {
+      rawValue = content
+      textEditor?.setContent(content)
+    }
     modified = false
   }
   $: if (!modified && rawValue !== content) modified = true
diff --git a/plugins/attachment-resources/src/components/AttachmentStyleBoxEditor.svelte b/plugins/attachment-resources/src/components/AttachmentStyleBoxEditor.svelte
index c937a1efae..e72b323059 100644
--- a/plugins/attachment-resources/src/components/AttachmentStyleBoxEditor.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentStyleBoxEditor.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Class, Doc, Ref, updateAttribute } from '@hcengineering/core'
+  import { Doc, updateAttribute } from '@hcengineering/core'
 
   import { IntlString } from '@hcengineering/platform'
   import { createQuery, getAttribute, getClient, KeyedAttribute } from '@hcengineering/presentation'
@@ -27,27 +27,27 @@
   export let key: KeyedAttribute
   export let placeholder: IntlString
   export let focusIndex = -1
-  let _id: Ref<Doc> | undefined = undefined
-  let _class: Ref<Class<Doc>> | undefined = undefined
   const client = getClient()
 
   const queryClient = createQuery()
 
-  let description = ''
+  let description: string
+  let haveUnsavedChanges = false
 
-  let doc: Doc | undefined
-  function checkForNewObject (object: Doc) {
-    if (object._id !== _id) return true
-    if (object._class !== _class) return true
-    return false
+  $: if (object && description === undefined) {
+    description = getAttribute(client, object, key)
   }
+
+  // We need to query the document one more time
+  // To make a difference between update of description from the bottom
+  // And update to if from another tab.
   $: object &&
-    queryClient.query(object._class, { _id: object._id }, async (result) => {
-      ;[doc] = result
-      if (doc && checkForNewObject(object)) {
-        _class = object._class
-        _id = object._id
-        description = getAttribute(client, object, key)
+    queryClient.query(object._class, { _id: object._id }, async (result: Doc[]) => {
+      if (result.length > 0) {
+        if (!haveUnsavedChanges) {
+          const doc = result[0]
+          description = getAttribute(client, doc, key)
+        }
       }
     })
 
@@ -64,10 +64,13 @@
     const old = getAttribute(client, object, key)
     if (description !== old) {
       await updateAttribute(client, object, object._class, key, description)
+      haveUnsavedChanges = false
       dispatch('saved', true)
       setTimeout(() => {
         dispatch('saved', false)
       }, 2500)
+    } else {
+      haveUnsavedChanges = false
     }
 
     await descriptionBox.createAttachments()
@@ -75,6 +78,7 @@
 
   let saveTrigger: any
   function triggerSave (): void {
+    haveUnsavedChanges = true
     clearTimeout(saveTrigger)
     saveTrigger = setTimeout(save, 2500)
   }
@@ -84,7 +88,7 @@
   }
 </script>
 
-{#key doc?._id}
+{#key object?._id}
   <AttachmentStyledBox
     {focusIndex}
     enableBackReferences={true}