diff --git a/admin-dev/themes/template/suppliers/view.tpl b/admin-dev/themes/template/suppliers/view.tpl
index 0d4c5a5fe..908d5c57c 100644
--- a/admin-dev/themes/template/suppliers/view.tpl
+++ b/admin-dev/themes/template/suppliers/view.tpl
@@ -24,6 +24,10 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
+{extends file="helper/view/view.tpl"}
+
+{block name="override_tpl"}
+
 <h2>{$supplier->name}</h2>
 
 <h3>{l s='Total products:'} {count($products)}</h3>
@@ -61,5 +65,6 @@
 		</table>
 	{/if}
 {/foreach}
-<br /><br />
-<a href="{$current}&token={$token}"><img src="../img/admin/arrow2.gif" /> {l s='Back to manufacturer list'}</a><br />
+
+{/block}
+
diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php
index 37397370e..82842ff49 100644
--- a/controllers/admin/AdminSuppliersController.php
+++ b/controllers/admin/AdminSuppliersController.php
@@ -190,11 +190,13 @@ class AdminSuppliersControllerCore extends AdminController
 			}
 		}
 
-		$this->context->smarty->assign(array(
+		$this->tpl_view_vars = array(
 			'supplier' => $this->object,
 			'products' => $products,
 			'stock_management' => Configuration::get('PS_STOCK_MANAGEMENT'),
-		));
+		);
+
+		return parent::initView();
 	}
 
 	public function afterImageUpload()