diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0a07d83..fc59b876 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
   * [Improved] #417 only raise exception about data being a string if dataType is "json"
   * [Fixed] #402, #405 rare exception in dnd events
   * [Fixed] #420 nodeSetActive not returning promise
+  * [Fixed] #270 Keyboard focus not working when using dnd extension
 
 # 2.8.1 / 2015-03-01
   * [Improved] generateFormElements() new argument `opts`, default: `{stopOnParents: true}`
diff --git a/src/jquery.fancytree.dnd.js b/src/jquery.fancytree.dnd.js
index b17c9689..d0ee9356 100644
--- a/src/jquery.fancytree.dnd.js
+++ b/src/jquery.fancytree.dnd.js
@@ -236,7 +236,8 @@ $.ui.fancytree.registerExtension({
 		// issue #270: draggable eats mousedown events
 		if( tree.options.dnd.dragStart ){
 			tree.$container.on("mousedown", function(event){
-				if( !tree.hasFocus() && ctx.options.dnd.focusOnClick ) {
+//				if( !tree.hasFocus() && ctx.options.dnd.focusOnClick ) {
+				if( ctx.options.dnd.focusOnClick ) {  // #270
 					var node = $.ui.fancytree.getNode(event);
 					if (node){
 						node.debug("Re-enable focus that was prevented by jQuery UI draggable.");