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: