diff --git a/controllers/admin/AdminModulesPositionsController.php b/controllers/admin/AdminModulesPositionsController.php
index d7b01f52a..10c1d7191 100644
--- a/controllers/admin/AdminModulesPositionsController.php
+++ b/controllers/admin/AdminModulesPositionsController.php
@@ -281,7 +281,7 @@ class AdminModulesPositionsControllerCore extends AdminController
 			'url_show_invisible' => self::$currentIndex.'&token='.$this->token.'&show_modules='.(int)Tools::getValue('show_modules').'&hook_position=',
 			'hook_position' => Tools::getValue('hook_position'),
 			'live_edit' => Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP,
-			'url_live_edit' => $this->context->shop->getBaseUrl().'?live_edit&ad='.$admin_dir.'&liveToken='.sha1($admin_dir._COOKIE_KEY_),
+			'url_live_edit' => $this->context->shop->getBaseUrl().'index.php?live_edit&ad='.$admin_dir.'&liveToken='.sha1($admin_dir._COOKIE_KEY_),
 			'display_key' => $this->display_key,
 			'hooks' => $hooks,
 			'url_submit' => self::$currentIndex.'&token='.$this->token,
diff --git a/js/hookLiveEdit.js b/js/hookLiveEdit.js
index e1255b2d1..48bc6664e 100644
--- a/js/hookLiveEdit.js
+++ b/js/hookLiveEdit.js
@@ -4,7 +4,7 @@ var hookable_list = new Array();
 var timer;
 $(document).ready(function() {
 	// do some place for submit button
-	$('body').css('margin-bottom', '45px');
+	$('body').css('margin-top', '45px');
 	// this is the result box, which will "pop up" the succeed or fail result
 	$('#fancy').fancybox({
 		autoDimensions: true,
@@ -20,18 +20,15 @@ $(document).ready(function() {
 	$('#live_edit_feedback_str').html('');
 	// add liveToken in each link to navigate into the shop and keeping the liveedit mode
 	$('a').each(function() {
-		var href = $(this).attr('href');
-		var search = $(this).attr('search');
+		var href = this.href;
+		var search = this.search;
 		var hrefAdd = 'live_edit&liveToken=' + get('liveToken') + '&ad=' + get('ad') + '&id_shop=' + get('id_shop');
-		if (href != undefined && href != '#' && href.substr(0, baseDir.length) == baseDir) {
+		if (href != undefined && href != '#' && href.substr(0, baseDir.length) == baseDir)
+		{
 			if (search.length == 0)
-			{
-				$(this).attr('search', hrefAdd);
-			}
+				this.search = hrefAdd;
 			else
-			{
-				$(this).attr('search', search + '&' + hrefAdd);
-			}
+				this.search += '&' + hrefAdd;
 		}
 	});
 	// populate