diff --git a/core/js/apps.js b/core/js/apps.js
index a2d3460c90..3b94aa1d87 100644
--- a/core/js/apps.js
+++ b/core/js/apps.js
@@ -79,6 +79,10 @@
 					area.slideDown(OC.menuSpeed*4, function() {
 						area.trigger(new $.Event('show'));
 					});
+					var input = $(areaSelector + ' [autofocus]');
+					if (input.length === 1) {
+						input.focus();
+					}
 				}
 
 				// do nothing if the area is animated