diff --git a/erp5/util/test_browser/browser.py b/erp5/util/test_browser/browser.py
index f4e1d72b5425f010a1206ab01cdc482f9489d654..dec4c2b64224d27c4b61c1ccf47a350200600689 100644
--- a/erp5/util/test_browser/browser.py
+++ b/erp5/util/test_browser/browser.py
@@ -634,16 +634,13 @@ class ContextMainForm(MainForm):
     @type script_id: str
     """
     try:
-      if value:
-        value = '%s?workflow_action=%s' % (script_id, value)
-
-      self.submitSelect('select_action', 'Base_doAction:method', label, value)
+      self.submitSelect('select_action', 'Base_doAction:method', label,
+                        value and '%s?workflow_action=%s' % (script_id, value))
 
     except LookupError:
-      if value:
-        value = '%s?field_my_workflow_action=%s' % (script_id, value)
-
-      self.submitSelect('select_action', 'Base_doAction:method', label, value)
+      self.submitSelect('select_action', 'Base_doAction:method', label,
+                        value and '%s?field_my_workflow_action=%s' % (script_id,
+                                                                      value))
 
   def submitDialogCancel(self):
     """