diff --git a/src/lib/EditMessage.svelte b/src/lib/EditMessage.svelte
index 513d504..836c42a 100644
--- a/src/lib/EditMessage.svelte
+++ b/src/lib/EditMessage.svelte
@@ -36,13 +36,13 @@
   let defaultModel:Model
 
   onMount(() => {
-    original = message.content
     defaultModel = chatSettings.model
   })
 
   const edit = () => {
-    if (message.summarized || message.streaming) return
+    if (message.summarized || message.streaming || editing) return
     editing = true
+    original = message.content
     setTimeout(() => {
       const el = document.getElementById('edit-' + message.uuid)
       el && el.focus()
@@ -73,6 +73,7 @@
 
   const keydown = (event:KeyboardEvent) => {
     if (event.key === 'Escape') {
+      if (!editing) return
       event.stopPropagation()
       event.preventDefault()
       message.content = original
diff --git a/src/lib/Settings.svelte b/src/lib/Settings.svelte
index b5b6e7b..45819e1 100644
--- a/src/lib/Settings.svelte
+++ b/src/lib/Settings.svelte
@@ -60,7 +60,7 @@ const gptDefaults = {
   n: 1,
   stream: true,
   stop: null,
-  max_tokens: 512,
+  max_tokens: 500,
   presence_penalty: 0,
   frequency_penalty: 0,
   logit_bias: null,
@@ -222,7 +222,7 @@ const summarySettings: ChatSetting[] = [
         name: 'Max Summary Size',
         title: 'Maximum number of tokens allowed for summary response.',
         min: 128,
-        max: 2048,
+        max: 512,
         step: 1,
         type: 'number',
         hide: (chatId) => getChatSettings(chatId).continuousChat !== 'summary'