diff --git a/CHANGELOG.md b/CHANGELOG.md
index 619fc86..7049eb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,9 @@ Procedure when bumping the version number:
 
 ## Unreleased
 
+### Fixed
+- Scrolling when exiting message editor
+
 ## v0.2.0 - 2022-08-10
 
 ### Added
diff --git a/src/ui/chat/tree.rs b/src/ui/chat/tree.rs
index 0aa5ec8..b421886 100644
--- a/src/ui/chat/tree.rs
+++ b/src/ui/chat/tree.rs
@@ -235,6 +235,7 @@ impl<M: Msg, S: MsgStore<M>> InnerTreeViewState<M, S> {
         match event {
             key!(Esc) => {
                 self.cursor = coming_from.map(Cursor::Msg).unwrap_or(Cursor::Bottom);
+                self.correction = Some(Correction::MakeCursorVisible);
                 return Reaction::Handled;
             }