diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index d9c4e6f27..d55cb8a81 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1119,8 +1119,6 @@ class AdminControllerCore extends Controller
 		if (!is_array($this->toolbar_title))
 			$this->toolbar_title = array($this->toolbar_title);
 
-		$title = implode(' '.Configuration::get('PS_NAVIGATION_PIPE').' ', $this->toolbar_title);
-
 		switch ($this->display)
 		{
 			case 'view':
@@ -1135,6 +1133,12 @@ class AdminControllerCore extends Controller
 						'href' => $back,
 						'desc' => $this->l('Back to list')
 					);
+				$obj = $this->loadObject();
+				if (Validate::isLoadedObject($obj) && isset($obj->name) && !empty($obj->name))
+				{
+					array_pop($this->toolbar_title);
+					$this->toolbar_title[] = is_array($obj->name) ? $obj->name[$this->context->employee->id_lang] : $obj->name;
+				}
 				break;
 			case 'add':
 			case 'edit':
@@ -1154,6 +1158,14 @@ class AdminControllerCore extends Controller
 						'href' => $back,
 						'desc' => $this->l('Cancel')
 					);
+
+				$obj = $this->loadObject();
+				if (Validate::isLoadedObject($obj) && isset($obj->name) && !empty($obj->name))
+				{
+					array_pop($this->toolbar_title);
+					$this->toolbar_title[] = sprintf($this->l('Edit: %s'),
+						is_array($obj->name) ? $obj->name[$this->context->employee->id_lang] : $obj->name);
+				}
 				break;
 			case 'options':
 				// Default save button - action dynamically handled in javascript
@@ -1163,6 +1175,8 @@ class AdminControllerCore extends Controller
 				);
 		}
 
+		$title = implode(' '.Configuration::get('PS_NAVIGATION_PIPE').' ', $this->toolbar_title);
+
 		if (is_array($this->page_header_toolbar_btn)
 			&& $this->page_header_toolbar_btn instanceof Traversable
 			|| trim($title) != '')
diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php
index 823c8e0ce..de4877ab0 100644
--- a/controllers/admin/AdminCategoriesController.php
+++ b/controllers/admin/AdminCategoriesController.php
@@ -168,17 +168,6 @@ class AdminCategoriesControllerCore extends AdminController
 				'desc' => $this->l('Add new category'),
 				'icon' => 'process-icon-new'
 			);
-
-		if ($this->display == 'view')
-		{
-			array_pop($this->toolbar_title);
-			$obj = $this->loadObject();
-
-			if (Validate::isLoadedObject($obj))
-				$this->toolbar_title[] = $obj->name[$this->context->employee->id_lang];
-
-			$this->page_header_toolbar_title = implode(' '.Configuration::get('PS_NAVIGATION_PIPE').' ', $this->toolbar_title);
-		}
 	}
 	
 	public function initContent()