From 27277155393a14458ccb8bab7417f68550bb6b75 Mon Sep 17 00:00:00 2001
From: ghidra1 <ghidra1@users.noreply.github.com>
Date: Mon, 30 Jun 2025 14:36:16 -0400
Subject: [PATCH] GP-5797 Corrected CommentsDialog regression.  Default to
 previously used tab

---
 .../java/ghidra/app/plugin/core/comments/CommentsDialog.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/comments/CommentsDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/comments/CommentsDialog.java
index 200d4817d1..4cf3720b49 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/comments/CommentsDialog.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/comments/CommentsDialog.java
@@ -137,8 +137,7 @@ public class CommentsDialog extends ReusableDialogComponentProvider implements K
 
 	void setCommentType(CommentType type) {
 		if (type == null) {
-			tab.setSelectedIndex(0);
-			return;
+			return; // Leave tab unchanged from last use
 		}
 		switch (type) {
 			case CommentType.EOL: