diff --git a/controllers/admin/AdminCmsContentController.php b/controllers/admin/AdminCmsContentController.php
index e08e75233..7a4fc68e5 100644
--- a/controllers/admin/AdminCmsContentController.php
+++ b/controllers/admin/AdminCmsContentController.php
@@ -116,6 +116,7 @@ class AdminCmsContentControllerCore extends AdminController
 	public function renderPageHeaderToolbar()
 	{
 		$id_cms_category = (int)Tools::getValue('id_cms_category');
+		$id_cms_page = Tools::getValue('id_cms');
 
 		if (!$id_cms_category)
 			$id_cms_category = 1;
@@ -124,7 +125,24 @@ class AdminCmsContentControllerCore extends AdminController
 		$this->toolbar_title[] = 'CMS';
 
 		if ($this->display == 'edit_category')
-			$this->toolbar_title[] = sprintf($this->l('Edit: %s'), $cms_category->name[$this->context->employee->id_lang]);
+		{
+			if (Tools::getValue('addcms_category') !== false)
+				$this->toolbar_title[] =$this->l('Add new');
+			else
+				$this->toolbar_title[] = sprintf($this->l('Edit: %s'), $cms_category->name[$this->context->employee->id_lang]);
+		}
+		elseif ($this->display == 'edit_page')
+		{
+			$this->toolbar_title[] = $cms_category->name[$this->context->employee->id_lang];
+
+			if (Tools::getValue('addcms') !== false)
+				$this->toolbar_title[] = $this->l('Add new');
+			elseif ($id_cms_page)
+			{
+				$cms_page = new CMS($id_cms_page);
+				$this->toolbar_title[] = sprintf($this->l('Edit: %s'), $cms_page->meta_title[$this->context->employee->id_lang]);
+			}
+		}
 		else
 			$this->toolbar_title[] = $cms_category->name[$this->context->employee->id_lang];