diff --git a/web/src/components/MemoEditor.tsx b/web/src/components/MemoEditor.tsx
index 6c547c9..d9678c2 100644
--- a/web/src/components/MemoEditor.tsx
+++ b/web/src/components/MemoEditor.tsx
@@ -99,8 +99,12 @@ const MemoEditor = () => {
   }, [editorState.editMemoId]);
 
   const handleKeyDown = (event: React.KeyboardEvent) => {
-    if (event.key === "Escape" && state.fullscreen) {
-      handleFullscreenBtnClick();
+    if (event.key === "Escape") {
+      if (state.fullscreen) {
+        handleFullscreenBtnClick();
+      } else {
+        handleCancelEdit();
+      }
       return;
     }
     if (event.key === "Tab") {