diff --git a/src/windows/room/chat.rs b/src/windows/room/chat.rs
index 9a873ef..8f49672 100644
--- a/src/windows/room/chat.rs
+++ b/src/windows/room/chat.rs
@@ -185,13 +185,15 @@ impl ChatState {
 
         match act {
             MessageAction::Cancel(skip_confirm) => {
-                self.reply_to = None;
-                self.editing = None;
-
                 if skip_confirm {
+                    self.reset();
+
                     return Ok(None);
                 }
 
+                self.reply_to = None;
+                self.editing = None;
+
                 let msg = "Would you like to clear the message bar?";
                 let act = PromptAction::Abort(false);
                 let prompt = PromptYesNo::new(msg, vec![Action::from(act)]);