Merge "Update @web/dev-server-esbuild to 0.3.6"
diff --git a/polygerrit-ui/app/models/views/change.ts b/polygerrit-ui/app/models/views/change.ts
index 127f77b..6cd7a0b 100644
--- a/polygerrit-ui/app/models/views/change.ts
+++ b/polygerrit-ui/app/models/views/change.ts
@@ -308,8 +308,8 @@
   public readonly childView$ = select(this.state$, state => state?.childView);
 
   public readonly tab$ = select(this.state$, state => {
-    if (state?.commentId) return Tab.COMMENT_THREADS;
     if (state?.tab) return state.tab;
+    if (state?.commentId) return Tab.COMMENT_THREADS;
     return Tab.FILES;
   });