diff --git a/bigg_models/templates/index.html b/bigg_models/templates/index.html
index a4eae62..3a2d769 100644
--- a/bigg_models/templates/index.html
+++ b/bigg_models/templates/index.html
@@ -70,7 +70,7 @@ <h1 class="title">BiGG Models</h1>
               <form id="search-form" action="/search" method="get">
                 <div class="input-group">
                   <!-- Autofocus here causes a bug in Safari where you
-                       cannot click the search bar -->
+                       cannot click the search bar, so we do it in JS -->
                   <input id="search" type="text" name="query" class="form-control"
                          placeholder="">
                   </input>
@@ -236,5 +236,10 @@ <h2>Connect to BiGG Models:</h2>
     </div><!-- /.modal -->
 
     {% include 'typeahead.html' %}
+
+    <!-- Autofocus -->
+    <script>
+     $(document).ready(function() { $('#search').focus() })
+    </script>
   </body>
 </html>