diff --git a/public/src/client/infinitescroll.js b/public/src/client/infinitescroll.js
index 0c34719420..32f5708a1c 100644
--- a/public/src/client/infinitescroll.js
+++ b/public/src/client/infinitescroll.js
@@ -8,11 +8,6 @@ define('forum/infinitescroll', ['hooks', 'alerts'], function (hooks, alerts) {
 	let loadingMore = false;
 	let container;
 	let scrollTimeout = 0;
-	let glance;
-
-	require(['forum/topic/glance'], (_glance) => {
-		glance = _glance;
-	});
 
 	scroll.init = function (el, cb) {
 		const $body = $('body');
@@ -44,8 +39,7 @@ define('forum/infinitescroll', ['hooks', 'alerts'], function (hooks, alerts) {
 	function onScroll() {
 		const bsEnv = utils.findBootstrapEnvironment();
 		const mobileComposerOpen = (bsEnv === 'xs' || bsEnv === 'sm') && $('html').hasClass('composing');
-		const glanceActive = glance.isActive();
-		if (loadingMore || mobileComposerOpen || glanceActive) {
+		if (loadingMore || mobileComposerOpen || app.flags._glance) {
 			return;
 		}
 		const currentScrollTop = $(window).scrollTop();
diff --git a/public/src/client/topic/glance.js b/public/src/client/topic/glance.js
index c445315ff4..b37260d305 100644
--- a/public/src/client/topic/glance.js
+++ b/public/src/client/topic/glance.js
@@ -112,6 +112,7 @@ function toggle(state) {
 	topicEl.classList[state ? 'add' : 'remove']('minimal');
 
 	if (state) {
+		app.flags._glance = true;
 		generatePlaceholders();
 		registerScrollEvent();
 	} else {
@@ -119,6 +120,7 @@ function toggle(state) {
 		deregisterScrollEvent();
 
 		navigator.scrollToIndex(navigator.getIndex() - 1, true, 0);
+		delete app.flags._glance;
 	}
 }