diff --git a/sklad/base.tmpl b/sklad/base.tmpl
index 542d019..d92a818 100644
--- a/sklad/base.tmpl
+++ b/sklad/base.tmpl
@@ -53,7 +53,7 @@
 	<a href=/series>Řady</a>
 
 	<form method=get action=/search>
-	<input type=text name=q><input type=submit value="Hledat">
+	<input type=text name=q autofocus><input type=submit value="Hledat">
 	</form>
 
 	<form method=post action=/logout>
diff --git a/sklad/login.tmpl b/sklad/login.tmpl
index dab1172..c34ab53 100644
--- a/sklad/login.tmpl
+++ b/sklad/login.tmpl
@@ -6,7 +6,7 @@
 
 <form method=post>
 <label for=password>Heslo:</label>
-<input type=password name=password id=password
+<input type=password name=password id=password autofocus
 ><input type=submit value="Přihlásit">
 </form>