diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml
index 36fdb29c1f2a6bced91d0bd0f017191fb6ef712c..bbbb192e44575e82e23b7938921bcbd6457af214 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml
@@ -87,7 +87,9 @@ function autoFocus() {\n
   }else{\n
     var first_text_input_expr = ".//input[@type=\'text\'][@name != \'field_your_search_text\']"\n
     var first_text_input = document.evaluate(first_text_input_expr, document, null, FIRST_RESULT, null).singleNodeValue;\n
-    first_text_input.focus();\n
+    if (first_text_input){\n
+      first_text_input.focus();\n
+    }\n
   }\n
 }\n
 \n
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
index 1dd3380cdc803bdfe9a1dcb15f5825a018f1dcf6..4f95481351d9aad41571c7becdadaadb6cc1d765 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
@@ -1 +1 @@
-516
\ No newline at end of file
+517
\ No newline at end of file