diff --git a/public/script.js b/public/script.js
index 64b8d43b3..b12d2d3e0 100644
--- a/public/script.js
+++ b/public/script.js
@@ -7193,8 +7193,10 @@ export function setGenerationParamsFromPreset(preset) {
 // Common code for message editor done and auto-save
 function updateMessage(div) {
     const mesBlock = div.closest('.mes_block');
-    let text = mesBlock.find('.edit_textarea').val();
-    const mes = chat[this_edit_mes_id];
+    let text = mesBlock.find('.edit_textarea').val()
+        ?? mesBlock.find('.mes_text').text();
+    const mesElement = div.closest('.mes');
+    const mes = chat[mesElement.attr('mesid')];
 
     let regexPlacement;
     if (mes.is_user) {
diff --git a/public/scripts/reasoning.js b/public/scripts/reasoning.js
index 421eb65b1..3eea8224d 100644
--- a/public/scripts/reasoning.js
+++ b/public/scripts/reasoning.js
@@ -288,6 +288,8 @@ function setReasoningEventHandlers() {
         await saveChatConditional();
         updateMessageBlock(messageId, message);
         textarea.remove();
+
+        messageBlock.find('.mes_edit_done:visible').trigger('click');
     });
 
     $(document).on('click', '.mes_reasoning_edit_cancel', function (e) {
@@ -297,6 +299,8 @@ function setReasoningEventHandlers() {
         const { messageBlock } = getMessageFromJquery(this);
         const textarea = messageBlock.find('.reasoning_edit_textarea');
         textarea.remove();
+
+        messageBlock.find('.mes_reasoning_edit_cancel:visible').trigger('click');
     });
 
     $(document).on('click', '.mes_edit_add_reasoning', async function () {
@@ -311,9 +315,8 @@ function setReasoningEventHandlers() {
         }
 
         message.extra.reasoning = PromptReasoning.REASONING_PLACEHOLDER;
-        await saveChatConditional();
-        closeMessageEditor();
         updateMessageBlock(messageId, message);
+        await saveChatConditional();
     });
 
     $(document).on('click', '.mes_reasoning_delete', async function (e) {