diff --git a/src/data/templates/gramps-base.html b/src/data/templates/gramps-base.html
index 5a0097665..4229f9454 100644
--- a/src/data/templates/gramps-base.html
+++ b/src/data/templates/gramps-base.html
@@ -18,7 +18,7 @@
     <script type="text/javascript" src="/styles/javascript/jquery-ui-1.7.2.custom.min.js"></script>
     {% endblock %}
 </head>
-<body onload="document.getElementById('get_focus').focus();">
+<body onload="if (document.getElementById('get_focus')) {document.getElementById('get_focus').focus();}">
    <div id="header">
      <h1 id="SiteTitle">{% block heading %}Gramps-Connect{% endblock %}</h1>
    </div>
diff --git a/src/data/templates/view_name_detail.html b/src/data/templates/view_name_detail.html
index ebbce3788..f445dd6bd 100644
--- a/src/data/templates/view_name_detail.html
+++ b/src/data/templates/view_name_detail.html
@@ -32,7 +32,7 @@
 <form method="post">{% csrf_token %}
 <tr>
  <td class="ColumnAttribute">{{form.surname.label}}:</td>
- <td class="ColumnValue" id="data">{% render form.surname user action %}</td>
+ <td class="ColumnValue" id="data">{% render form.surname user action False "" "get_focus" %}</td>
  <td class="ColumnAttribute">{{form.prefix.label}}:</td>
  <td class="ColumnValue" id="data">{% render form.prefix user action %}</td>
 </tr>
