diff --git a/packages/presentation/src/components/HTMLViewer.svelte b/packages/presentation/src/components/HTMLViewer.svelte
index ef51054424..1cd18df40e 100644
--- a/packages/presentation/src/components/HTMLViewer.svelte
+++ b/packages/presentation/src/components/HTMLViewer.svelte
@@ -22,4 +22,6 @@
   $: node = htmlToJSON(value)
 </script>
 
-<Node {node} {preview} />
+<div class="text-markup-view">
+  <Node {node} {preview} />
+</div>
diff --git a/packages/presentation/src/components/MessageViewer.svelte b/packages/presentation/src/components/MessageViewer.svelte
index d8074f02f9..5eb062b404 100644
--- a/packages/presentation/src/components/MessageViewer.svelte
+++ b/packages/presentation/src/components/MessageViewer.svelte
@@ -28,4 +28,6 @@
   }
 </script>
 
-<Node {node} {preview} />
+<div class="text-markup-view">
+  <Node {node} {preview} />
+</div>
diff --git a/packages/theme/styles/_text-editor.scss b/packages/theme/styles/_text-editor.scss
index 50fb11ff2b..9ea99e0d45 100644
--- a/packages/theme/styles/_text-editor.scss
+++ b/packages/theme/styles/_text-editor.scss
@@ -7,7 +7,8 @@
   }
 }
 
-.text-editor-view {
+.text-editor-view,
+.text-markup-view {
   // overflow-y: auto;
   color: var(--theme-text-primary-color);
   margin: 0.25rem 0;
diff --git a/qms-tests/sanity/tests/model/documents/document-comments-page.ts b/qms-tests/sanity/tests/model/documents/document-comments-page.ts
index 2f59785378..f13c0e3a74 100644
--- a/qms-tests/sanity/tests/model/documents/document-comments-page.ts
+++ b/qms-tests/sanity/tests/model/documents/document-comments-page.ts
@@ -86,9 +86,13 @@ export class DocumentCommentsPage extends DocumentCommonPage {
     // check author
     await expect(comment.locator('div.root div.header > a span[class*="label"]').first()).toHaveText(author)
     // check message
-    await expect(comment.locator('div.activityMessage div.flex-col div.clear-mins > p').first()).toHaveText(message)
+    await expect(
+      comment.locator('div.activityMessage div.flex-col div.clear-mins div.text-markup-view > p').first()
+    ).toHaveText(message)
     // check comment
-    await expect(comment.locator('div.activityMessage div.flex-col div.clear-mins > p').last()).toHaveText(reply)
+    await expect(
+      comment.locator('div.activityMessage div.flex-col div.clear-mins div.text-markup-view > p').last()
+    ).toHaveText(reply)
   }
 
   async checkCommentInPanelById (
@@ -109,8 +113,12 @@ export class DocumentCommentsPage extends DocumentCommonPage {
     // check author
     await expect(comment.locator('div.root div.header > a span[class*="label"]').first()).toHaveText(author)
     // check message
-    await expect(comment.locator('div.activityMessage div.flex-col div.clear-mins > p').first()).toHaveText(message)
+    await expect(
+      comment.locator('div.activityMessage div.flex-col div.clear-mins div.text-markup-view > p').first()
+    ).toHaveText(message)
     // check comment
-    await expect(comment.locator('div.activityMessage div.flex-col div.clear-mins > p').last()).toHaveText(reply)
+    await expect(
+      comment.locator('div.activityMessage div.flex-col div.clear-mins div.text-markup-view > p').last()
+    ).toHaveText(reply)
   }
 }