diff --git a/app/javascript/flavours/glitch/containers/scroll_container.js b/app/javascript/flavours/glitch/containers/scroll_container.js
index 595f3155f..740e266cb 100644
--- a/app/javascript/flavours/glitch/containers/scroll_container.js
+++ b/app/javascript/flavours/glitch/containers/scroll_container.js
@@ -4,7 +4,8 @@ import { ScrollContainer as OriginalScrollContainer } from 'react-router-scroll-
 // new history state and remembering the scroll position when going back.
 // There are a few things we need to do differently, though.
 const defaultShouldUpdateScroll = (prevRouterProps, { location }) => {
-  return !(prevRouterProps?.location?.state?.mastodonModalKey || location.state?.mastodonModalKey);
+  // If the change is caused by opening a modal, do not scroll to top
+  return !(location.state?.mastodonModalKey && location.state?.mastodonModalKey !== prevRouterProps?.location?.state?.mastodonModalKey);
 }
 
 export default