diff --git a/lib/workflow/shopWorkflowAction.class.php b/lib/workflow/shopWorkflowAction.class.php
index 2b62dabdd..28b945568 100644
--- a/lib/workflow/shopWorkflowAction.class.php
+++ b/lib/workflow/shopWorkflowAction.class.php
@@ -554,8 +554,7 @@ protected function getShippingFields($order_id, $state)
                     if (!empty($order['params']['shipping_data_'.$name])) {
                         $control['value'] = $order['params']['shipping_data_'.$name];
                     }
-                    $control = array_merge($control, $params);
-                    $controls[$name] = waHtmlControl::getControl($control['control_type'], $name, $control);
+                    $controls[$name] = waHtmlControl::getControl($control['control_type'], $name, $control + $params);
                 }
             }
         }