diff --git a/packages/excalidraw/components/App.tsx b/packages/excalidraw/components/App.tsx
index aa31a283e..18c469150 100644
--- a/packages/excalidraw/components/App.tsx
+++ b/packages/excalidraw/components/App.tsx
@@ -4071,9 +4071,10 @@ class App extends React.Component<AppProps, AppState> {
         event.key === KEYS.ESCAPE &&
         // unless we're dragging or finalizing an action
         !(
-          this.state.draggingElement ||
+          this.state.newElement ||
           isWritableElement(event.target) ||
-          this.state.editingElement ||
+          this.state.editingTextElement ||
+          this.state.editingLinearElement ||
           ["freedraw", "eraser"].includes(this.state.activeTool.type)
         )
       ) {