diff --git a/CHANGES.md b/CHANGES.md
index b51a56e60..54c943951 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -44,6 +44,7 @@
 - Right click over artboard name to open its menu [Taiga #1679](https://tree.taiga.io/project/penpot/issue/1679)
 - Make the default session cookue use SameSite=Lax instead of Strict (causes some issues in latest versions of Chrome).
 - Fix "open in new tab" on dashboard [Taiga #2235](https://tree.taiga.io/project/penpot/issue/2355)
+- Fix navigate comments in right sidebar [Taiga #2163](https://tree.taiga.io/project/penpot/issue/2163)
 
 ### :arrow_up: Deps updates
 
diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs
index e8930c73f..8146ef574 100644
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -445,7 +445,7 @@
                                           :y (+ (:y srect) (/ (- (:height srect) height) 2)))))))
 
           (setup [state local]
-            (if (:vbox local)
+            (if (and (:vbox local) (:vport local))
               (update* local)
               (initialize state local)))]
 
diff --git a/frontend/src/app/main/data/workspace/comments.cljs b/frontend/src/app/main/data/workspace/comments.cljs
index 8a07d1d90..a064b0d0a 100644
--- a/frontend/src/app/main/data/workspace/comments.cljs
+++ b/frontend/src/app/main/data/workspace/comments.cljs
@@ -96,8 +96,7 @@
                      :file-id (:file-id thread)}
             qparams {:page-id (:page-id thread)}]
         (rx/merge
-         (rx/of (rt/nav :workspace pparams qparams)
-                (dw/select-for-drawing :comments))
+         (rx/of (rt/nav :workspace pparams qparams))
          (->> stream
               (rx/filter (ptk/type? ::dw/initialize-viewport))
               (rx/take 1)
diff --git a/frontend/src/app/main/ui/workspace/comments.cljs b/frontend/src/app/main/ui/workspace/comments.cljs
index ea92fc79d..322aa473c 100644
--- a/frontend/src/app/main/ui/workspace/comments.cljs
+++ b/frontend/src/app/main/ui/workspace/comments.cljs
@@ -79,7 +79,9 @@
              (st/emit! (dw/go-to-page (:page-id thread))))
            (tm/schedule
             (fn []
-              (st/emit! (dwcm/center-to-comment-thread thread)
+              (st/emit! (when (not= page-id (:page-id thread))
+                          (dw/select-for-drawing :comments))
+                        (dwcm/center-to-comment-thread thread)
                         (-> (dcm/open-thread thread)
                             (with-meta {::ev/origin "workspace"})))))))]