diff --git a/src/components/App.tsx b/src/components/App.tsx
index 993141d21..daebe197c 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -7661,8 +7661,11 @@ class App extends React.Component<AppProps, AppState> {
       height === prevState.height &&
       cursorButton === prevState.cursorButton;
 
-    // If the state hasn't changed or the scroll constraints are not defined, return null
-    if (!scrollConstraints || stateUnchanged) {
+    // If the state hasn't changed and scrollConstraints didn't just get defined, return null
+    if (
+      !scrollConstraints ||
+      (stateUnchanged && (prevState.scrollConstraints || !scrollConstraints))
+    ) {
       return null;
     }