diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_goToDocument.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_goToDocument.xml
index 940dc51e49b31e9fc4a2a79429c2971a1ff1f780..6caa35fc9c38cb1db276535e61c98d050ce9c0d8 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_goToDocument.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_goToDocument.xml
@@ -60,13 +60,13 @@ if not application_number and id:\n
   application_number = id\n
 \n
 keep_items = {}\n
-state = document.getValidationState()\n
 \n
 # default view is history view\n
 form_id=\'PDFDocument_viewHistory\'\n
 \n
 if application_number:\n
   document = context.portal_catalog.getResultValue(id=application_number)\n
+  state = document.getValidationState()\n
   if document is not None:\n
     if state == \'draft\':\n
       form_id=\'view\'\n
@@ -128,9 +128,9 @@ return context.Base_redirect(form_id=\'view\', keep_items = {\'portal_status_mes
                             <string>portal</string>
                             <string>N_</string>
                             <string>keep_items</string>
+                            <string>form_id</string>
                             <string>document</string>
                             <string>state</string>
-                            <string>form_id</string>
                             <string>None</string>
                             <string>msg</string>
                           </tuple>
diff --git a/bt5/erp5_egov/bt/revision b/bt5/erp5_egov/bt/revision
index e41567feb87fd40d6e88e91674e66a77a5074304..1380537bfd769da6c47bce5c91a7c45a57e7df7c 100644
--- a/bt5/erp5_egov/bt/revision
+++ b/bt5/erp5_egov/bt/revision
@@ -1 +1 @@
-384
\ No newline at end of file
+385
\ No newline at end of file