diff --git a/modules/blocklink/blocklink.js b/modules/blocklink/blocklink.js
deleted file mode 100644
index d33b1cc37..000000000
--- a/modules/blocklink/blocklink.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-* 2007-2012 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2012 PrestaShop SA
-*  @version  Release: $Revision: 6844 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-function linkEdition(linkId)
-{
-	document.location.replace(currentUrl+'&id_link='+linkId+'&token='+token);
-}
-
-function linkDeletion(linkId)
-{
- 	document.location.replace(currentUrl+'&id='+linkId+'&delete_link=1&token='+token);
-}
diff --git a/modules/blocklink/blocklink.php b/modules/blocklink/blocklink.php
index daddb8fda..5abba6e08 100644
--- a/modules/blocklink/blocklink.php
+++ b/modules/blocklink/blocklink.php
@@ -391,7 +391,7 @@ class BlockLink extends Module
 	 	{
 			$this->_html .= '
 			<script type="text/javascript">
-				var currentUrl = \''.Tools::safeOutput(AdminController::$currentIndex.'&configure='.$this->name).'\';
+				var currentUrl = \''.Tools::safeOutput($_SERVER['REQUEST_URI']).'\';
 				var token=\''.$token.'\';
 				var links = new Array();';
 			foreach ($links as $link)
@@ -429,8 +429,8 @@ class BlockLink extends Module
 					<td>'.Tools::safeOutput($link['text_'.$this->context->language->id]).'</td>
 					<td>'.Tools::safeOutput($link['url']).'</td>
 					<td>
-						<img src="../img/admin/edit.gif" alt="" title="" onclick="linkEdition('.(int)$link['id'].')" style="cursor: pointer" />
-						<img src="../img/admin/delete.gif" alt="" title="" onclick="linkDeletion('.(int)$link['id'].')" style="cursor: pointer" />
+						<a href="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'&id_link='.(int)$link['id'].'"><img src="../img/admin/edit.gif" alt="" title="" style="cursor: pointer" /></a>
+						<a href="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'&id='.(int)$link['id'].'&delete_link=1"><img src="../img/admin/delete.gif" alt="" title="" style="cursor: pointer" /></a>
 					</td>
 				</tr>';
 		$i = 0;