diff --git a/src/main/webapp/js/admin/admin.js b/src/main/webapp/js/admin/admin.js
index 3a1c18506..bb3c5af39 100644
--- a/src/main/webapp/js/admin/admin.js
+++ b/src/main/webapp/js/admin/admin.js
@@ -1,5 +1,5 @@
 $(function() {
-	$('input[type="text"]:first', '.login-box,section.content').focus();
+	$('input[type="text"],select', '.login-box,section.content').first().focus();
 
 	$("section.content input").keypress(function(e) {
 		if (e.which == 13) {