1 files changed, 15 insertions, 11 deletions

diff --git a/app/assets/javascripts/notes/mixins/discussion_navigation.js b/app/assets/javascripts/notes/mixins/discussion_navigation.js
index f7c4deee1f8..2c9570952b2 100644
--- a/app/assets/javascripts/notes/mixins/discussion_navigation.js
+++ b/app/assets/javascripts/notes/mixins/discussion_navigation.js
@@ -9,21 +9,25 @@ export default {
           activeTab === 'diffs'
             ? `ul.notes[data-discussion-id="${id}"]`
             : `div.discussion[data-discussion-id="${id}"]`;
-        const el = document.querySelector(selector);
 
-        if (activeTab === 'commits' || activeTab === 'pipelines') {
-          window.mrTabs.activateTab('show');
-        }
+        this.expandDiscussion({ discussionId: id });
 
-        if (el) {
-          this.expandDiscussion({ discussionId: id });
+        this.$nextTick(() => {
+          const el = document.querySelector(selector);
 
-          scrollToElement(el);
-          return true;
-        }
-      }
+          if (activeTab === 'commits' || activeTab === 'pipelines') {
+            window.mrTabs.activateTab('show');
+          }
+
+          if (el) {
+            scrollToElement(el);
 
-      return false;
+            return true;
+          }
+
+          return false;
+        });
+      }
     },
   },
 };