diff --git a/browser/src/layer/tile/CommentListSection.ts b/browser/src/layer/tile/CommentListSection.ts
index d3860a2a5..24637a4f2 100644
--- a/browser/src/layer/tile/CommentListSection.ts
+++ b/browser/src/layer/tile/CommentListSection.ts
@@ -576,6 +576,7 @@ class CommentSection {
 			}
 		}
 		else {
+			this.unselect();
 			annotation.reply();
 			this.select(annotation);
 			annotation.focus();
@@ -591,6 +592,7 @@ class CommentSection {
 				this.save(annotation);
 			}.bind(this), /* isMod */ true);
 		} else {
+			this.unselect();
 			annotation.edit();
 			this.select(annotation);
 			annotation.focus();