diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js
index 0d20fa20f5..b93e219264 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js
@@ -150,6 +150,9 @@ Class.create("FilesList", SelectableElements, {
 			this._fireChange = false;
             this.setSelectedNodes(dm.getSelectedNodes());
             this._fireChange = origFC;
+            if(!this.hasFocus){
+                window.setTimeout(function(){pydio.UI.focusOn(this);}.bind(this),10);
+            }
 		}.bind(this);
 
         if(this._dataModel){
diff --git a/core/src/plugins/gui.ajax/res/js/vendor/prototype/webfx.selectable.js b/core/src/plugins/gui.ajax/res/js/vendor/prototype/webfx.selectable.js
index af3c8d633d..0d69b6520b 100644
--- a/core/src/plugins/gui.ajax/res/js/vendor/prototype/webfx.selectable.js
+++ b/core/src/plugins/gui.ajax/res/js/vendor/prototype/webfx.selectable.js
@@ -93,6 +93,9 @@ Class.create('SelectableElements', {
 		Event.observe(this.dragSelectionElement, "mousedown", this.eventMouseDown);
 	},
 	dragStart : function(e){
+        if(!this.hasFocus){
+            pydio.UI.focusOn(this);
+        }
 		this.originalX = e.clientX;
 		this.originalY = e.clientY;