diff --git a/src/components/Article/FullArticle.tsx b/src/components/Article/FullArticle.tsx
index a350b1fb..7bc6c174 100644
--- a/src/components/Article/FullArticle.tsx
+++ b/src/components/Article/FullArticle.tsx
@@ -270,7 +270,7 @@ export const FullArticle = (props: ArticleProps) => {
                 )}
               </For>
             </div>
-            <div ref={commentsRef}>
+            <div>
               <Show when={isReactionsLoaded()}>
                 <CommentsTree
                   shoutId={props.article.id}
diff --git a/src/stores/router.ts b/src/stores/router.ts
index fbf26b34..ad7afc8d 100644
--- a/src/stores/router.ts
+++ b/src/stores/router.ts
@@ -57,6 +57,15 @@ const handleClientRouteLinkClick = (event) => {
     if (url.origin === location.origin) {
       event.preventDefault()
 
+      if (url.pathname) {
+        routerStore.open(url.pathname)
+      }
+
+      if (url.search) {
+        const params = Object.fromEntries(new URLSearchParams(url.search))
+        searchParamsStore.open(params)
+      }
+
       if (url.hash) {
         let selector = url.hash
 
@@ -79,10 +88,6 @@ const handleClientRouteLinkClick = (event) => {
         return
       }
 
-      routerStore.open(url.pathname)
-      const params = Object.fromEntries(new URLSearchParams(url.search))
-      searchParamsStore.open(params)
-
       window.scrollTo({
         top: 0,
         left: 0