diff --git a/src/index.tsx b/src/index.tsx
index 2108deb6..f0d93627 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -284,7 +284,7 @@ export class App extends React.Component<any, AppState> {
   };
 
   private onKeyDown = (event: KeyboardEvent) => {
-    if (event.key === KEYS.ESCAPE) {
+    if (event.key === KEYS.ESCAPE && !this.state.draggingElement) {
       elements = clearSelection(elements);
       this.forceUpdate();
       this.setState({ elementType: "selection" });