diff --git a/platform/platform-api/src/com/intellij/ui/MouseDragHelper.java b/platform/platform-api/src/com/intellij/ui/MouseDragHelper.java
index 0d8a3aac1c45..bb0ccb0cb25a 100644
--- a/platform/platform-api/src/com/intellij/ui/MouseDragHelper.java
+++ b/platform/platform-api/src/com/intellij/ui/MouseDragHelper.java
@@ -255,7 +255,7 @@ public abstract class MouseDragHelper implements MouseListener, MouseMotionListe
 
   @Override
   public boolean dispatchKeyEvent(KeyEvent e) {
-    if (e.getKeyCode() == KeyEvent.VK_ESCAPE && e.getID() == KeyEvent.KEY_PRESSED) {
+    if (e.getKeyCode() == KeyEvent.VK_ESCAPE && e.getID() == KeyEvent.KEY_PRESSED && myDraggingNow) {
       myCancelled = true;
       if (myDetachingMode) {
         processDragOutCancel();