diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e230ab0..998bd682 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+- Fixed terminal scrolling to the beginning when a choice menu or diff panel appears (regression since 0.20.20)
+
 # 0.21.46 (2026-04-17)
 
 - Fixed Maven Central publication being skipped after upload
diff --git a/pom.xml b/pom.xml
index e54eb06e..13920f35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.nbclaudecodegui</groupId>
     <artifactId>netbeans-claude-code-gui</artifactId>
-    <version>0.21.55-SNAPSHOT</version>
+    <version>0.21.56-SNAPSHOT</version>
     <packaging>nbm</packaging>
     <name>Netbeans Claude Code GUI</name>
     <description>NetBeans plugin that provides a GUI for Claude Code CLI — run claude code sessions directly inside the IDE.</description>
diff --git a/src/main/java/io/github/nbclaudecodegui/ui/ClaudeSessionTab.java b/src/main/java/io/github/nbclaudecodegui/ui/ClaudeSessionTab.java
index 76571ec0..15060dbf 100644
--- a/src/main/java/io/github/nbclaudecodegui/ui/ClaudeSessionTab.java
+++ b/src/main/java/io/github/nbclaudecodegui/ui/ClaudeSessionTab.java
@@ -939,6 +939,12 @@ private void switchSouthCard(String card) {
         }
         southCard.revalidate();
         southCard.repaint();
+        // Keep the terminal scrolled to the bottom after layout changes caused by
+        // setDividerLocation() — JediTerm resets scroll position to top on resize.
+        if (terminalWidget != null) {
+            SwingUtilities.invokeLater(
+                    () -> terminalWidget.getTerminalPanel().scrollToShowAllOutput());
+        }
     }
 
     /**