diff --git a/ihatemoney/templates/list_bills.html b/ihatemoney/templates/list_bills.html
index 749c9070..79e25262 100644
--- a/ihatemoney/templates/list_bills.html
+++ b/ihatemoney/templates/list_bills.html
@@ -11,6 +11,11 @@
 {% block js %}
     {% if add_bill %} $('#new-bill > a').click(); {% endif %}
 
+    // focus on first field when adding a bill
+    $("#bill-form").on('shown.bs.modal', function(){
+            $(this).find('#what').focus();
+    });
+
     // ask for confirmation before removing an user
     $('.action.delete').each(function(){
         var link = $(this).find('button');
@@ -101,7 +106,7 @@
 </ul>
 {% endif %}
 <span id="new-bill" class="ml-auto pb-2" {% if not g.project.members %} data-toggle="tooltip" title="{{_('You should start by adding participants')}}" {% endif %}>
-    <a href="{{ url_for('.add_bill') }}" class="btn btn-primary {% if not g.project.members %} disabled {% endif %}" data-toggle="modal" data-keyboard="false" data-target="#bill-form">
+    <a href="{{ url_for('.add_bill') }}" class="btn btn-primary {% if not g.project.members %} disabled {% endif %}" data-toggle="modal" data-keyboard="true" data-target="#bill-form" autofocus>
         <i class="icon icon-white before-text">{{ static_include("images/plus.svg") | safe }}</i>
         {{ _("Add a new bill") }}
     </a>