1 files changed, 18 insertions, 4 deletions
diff --git a/app/assets/javascripts/diffs/store/getters.js b/app/assets/javascripts/diffs/store/getters.js
index 1b6a673925f..18bd8e5f1d8 100644
--- a/app/assets/javascripts/diffs/store/getters.js
+++ b/app/assets/javascripts/diffs/store/getters.js
@@ -1,3 +1,4 @@
+import Cookies from 'js-cookie';
 import { getParameterValues } from '~/lib/utils/url_utility';
 import { __, n__ } from '~/locale';
 import {
@@ -173,7 +174,20 @@ export function suggestionCommitMessage(state, _, rootState) {
     });
 }
 
-export const isVirtualScrollingEnabled = (state) =>
-  !state.viewDiffsFileByFile &&
-  (window.gon?.features?.diffsVirtualScrolling ||
-    getParameterValues('virtual_scrolling')[0] === 'true');
+export const isVirtualScrollingEnabled = (state) => {
+  const vSrollerCookie = Cookies.get('diffs_virtual_scrolling');
+
+  if (state.disableVirtualScroller) {
+    return false;
+  }
+
+  if (vSrollerCookie) {
+    return vSrollerCookie === 'true';
+  }
+
+  return (
+    !state.viewDiffsFileByFile &&
+    (window.gon?.features?.diffsVirtualScrolling ||
+      getParameterValues('virtual_scrolling')[0] === 'true')
+  );
+};