diff --git a/client/res/templates/stream/notes/update.tpl b/client/res/templates/stream/notes/update.tpl
index cabce70eee..903f975436 100644
--- a/client/res/templates/stream/notes/update.tpl
+++ b/client/res/templates/stream/notes/update.tpl
@@ -10,9 +10,6 @@
     </div>
     <div class="stream-head-text-container">
         {{#if iconHtml}}{{{iconHtml}}}{{/if}}<span class="text-muted message">{{{message}}}</span>
-        {{#if fieldDataList.length}}
-            <a role="button" tabindex="0" data-action="expandDetails"><span class="fas fa-chevron-down"></span></a>
-        {{/if}}
     </div>
 </div>
 
@@ -23,8 +20,14 @@
 {{/if}}
 
 {{#if fieldDataList.length}}
-    <div class="fields stream-details-container">
-        <span class="text-muted">{{fieldsString}}</span>
+    <div class="stream-details-container">
+        <a
+            role="button"
+            tabindex="0"
+            data-action="expandDetails"
+            class="text-soft"
+        ><span class="fas fa-chevron-down"></span></a><span style="user-select: none"> </span>
+        <span class="fields text-muted small">{{fieldsString}}</span>
     </div>
 {{/if}}
 
diff --git a/client/src/views/stream/notes/update.js b/client/src/views/stream/notes/update.js
index 0b2383f91a..a974dd065a 100644
--- a/client/src/views/stream/notes/update.js
+++ b/client/src/views/stream/notes/update.js
@@ -37,6 +37,12 @@ class UpdateNoteStreamView extends NoteStreamView {
     statusText
     statusStyle
 
+    /**
+     * @private
+     * @type {boolean}
+     */
+    isExpanded = false
+
     data() {
         const fieldsString = this.fieldDataList
             .map(it => it.label)
@@ -61,8 +67,18 @@ class UpdateNoteStreamView extends NoteStreamView {
         super.init();
     }
 
+    afterRender() {
+        super.afterRender();
+
+        if (this.isExpanded) {
+            this.isExpanded = false;
+
+            this.toggleDetails()
+        }
+    }
+
     setup() {
-        this.addActionHandler('expandDetails', (e, target) => this.toggleDetails(e, target));
+        this.addActionHandler('expandDetails', () => this.toggleDetails());
 
         this.createMessage();
 
@@ -156,15 +172,14 @@ class UpdateNoteStreamView extends NoteStreamView {
         });
     }
 
-    /**
-     * @param {MouseEvent} event
-     * @param {HTMLElement} target
-     */
-    toggleDetails(event, target) {
-        const $details = this.$el.find('> .details');
-        const $fields = this.$el.find('> .fields');
 
-        if ($details.hasClass('hidden')) {
+    toggleDetails() {
+        const target = this.element.querySelector('[data-action="expandDetails"]');
+
+        const $details = this.$el.find('> .details');
+        const $fields = this.$el.find('> .stream-details-container > .fields');
+
+        if (!this.isExpanded) {
             $details.removeClass('hidden');
             $fields.addClass('hidden');
 
@@ -182,6 +197,8 @@ class UpdateNoteStreamView extends NoteStreamView {
                 .removeClass('fa-chevron-down')
                 .addClass('fa-chevron-up');
 
+            this.isExpanded = true;
+
             return;
         }
 
@@ -191,6 +208,8 @@ class UpdateNoteStreamView extends NoteStreamView {
         $(target).find('span')
             .addClass('fa-chevron-down')
             .removeClass('fa-chevron-up');
+
+        this.isExpanded = false;
     }
 }