diff --git a/Makefile b/Makefile
index 6c5f1435f..1b52b4841 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 PORT ?= 3000
 
 start: bundle
-	bundle exec jekyll serve --safe --drafts --watch --port ${PORT}
+	bundle exec jekyll serve --safe --drafts --watch --port ${PORT} --incremental
 
 build: bundle
 	bundle exec jekyll build --safe
diff --git a/_layouts/2017/home.html b/_layouts/2017/home.html
index 85e40ec6a..153baf89b 100644
--- a/_layouts/2017/home.html
+++ b/_layouts/2017/home.html
@@ -7,7 +7,7 @@ type: website
 
 <div class='body-area -slim'>
   <div class='search-box'>
-    <input type='text' placeholder='Search...' />
+    <input type='text' placeholder='Search...' autofocus>
   </div>
 
   <div class='pages-list'>