diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
index e74cd8c6e35..f8cb2194c82 100644
--- a/src/View/Helper/FormHelper.php
+++ b/src/View/Helper/FormHelper.php
@@ -1046,13 +1046,13 @@ public function fieldset($fields = '', array $options = [])
         }
 
         if ($legend === true) {
-            $actionName = __d('cake', 'New %s');
             $isCreate = $context->isCreate();
+            $modelName = Inflector::humanize(Inflector::singularize($this->request->getParam('controller')));
             if (!$isCreate) {
-                $actionName = __d('cake', 'Edit %s');
+                $legend = __d('cake', 'Edit {0}', $modelName);
+            } else {
+                $legend = __d('cake', 'New {0}', $modelName);
             }
-            $modelName = Inflector::humanize(Inflector::singularize($this->request->getParam('controller')));
-            $legend = sprintf($actionName, $modelName);
         }
 
         if ($fieldset !== false) {