diff --git a/editor/code/CHANGELOG.md b/editor/code/CHANGELOG.md
index b5eee4a5a..ee3919345 100644
--- a/editor/code/CHANGELOG.md
+++ b/editor/code/CHANGELOG.md
@@ -1,6 +1,9 @@
 # coq-lsp 0.1.8: Trick-or-treat
 -------------------------------
 
+ - Give `Goals` panel focus back if it has lost it (in case of
+   multiple panels in the second viewColumn of Vscode) whenever
+   user navigates proofs
  - Update VSCode client dependencies, should bring some performance
    improvements to goal pretty printing (@ejgallego, #530)
  - Update goal display colors for light mode so they are actually
diff --git a/editor/code/src/goals.ts b/editor/code/src/goals.ts
index ff1aec936..eaddbddfd 100644
--- a/editor/code/src/goals.ts
+++ b/editor/code/src/goals.ts
@@ -97,6 +97,10 @@ export class InfoPanel {
   ensurePanel() {
     if (!this.panel) {
       this.panelFactory();
+    } else {
+      if (!this.panel.active) {
+        this.panel.reveal(2, false);
+      }
     }
   }
   postMessage({ method, params }: CoqMessagePayload) {