diff --git a/treebeard/static/treebeard/treebeard-admin.js b/treebeard/static/treebeard/treebeard-admin.js
index <HASH>..<HASH> 100644
--- a/treebeard/static/treebeard/treebeard-admin.js
+++ b/treebeard/static/treebeard/treebeard-admin.js
@@ -177,6 +177,13 @@ $(document).ready(function(){
             $ghost.remove();
             $drag_line.remove();
             $body.enableSelection().unbind('mousemove').unbind('mouseup');
+        }).bind('keyup', function(kbevt) {
+            // Cancel drag on escape
+            if (kbevt.keyCode === 27) {
+                $ghost.remove();
+                $drag_line.remove();
+                $body.enableSelection().unbind('mousemove').unbind('mouseup');
+            } 
         });
     });
Cancel D&D on esc