diff --git a/adm/style/portal/acp_portal_links.html b/adm/style/portal/acp_portal_links.html
index 56b0d468..4e6c68f2 100644
--- a/adm/style/portal/acp_portal_links.html
+++ b/adm/style/portal/acp_portal_links.html
@@ -54,6 +54,7 @@
 	</dl>
 	<p class="submit-buttons">
 		<input type="hidden" name="action" value="save" />
+		<!-- IF LINK_ID --><input type="hidden" name="id" value="{LINK_ID}" /><!-- ENDIF -->
 
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
diff --git a/adm/style/portal/acp_portal_menu.html b/adm/style/portal/acp_portal_menu.html
index 07b726ed..34a9351c 100644
--- a/adm/style/portal/acp_portal_menu.html
+++ b/adm/style/portal/acp_portal_menu.html
@@ -61,6 +61,7 @@
 	</div>
 	<p class="submit-buttons">
 		<input type="hidden" name="action" value="save" />
+		<!-- IF LINK_ID --><input type="hidden" name="id" value="{LINK_ID}" /><!-- ENDIF -->
 
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
diff --git a/modules/links.php b/modules/links.php
index fcf7df78..04af91d9 100644
--- a/modules/links.php
+++ b/modules/links.php
@@ -407,11 +407,9 @@ class links extends module_base
 					'LINK_TITLE'	=> (isset($links[$link_id]['title']) && $action != 'add') ? $links[$link_id]['title'] : '',
 					'LINK_URL'		=> (isset($links[$link_id]['url']) && $action != 'add') ? str_replace('&', '&amp;', $links[$link_id]['url']) : '',
 
-					//'U_BACK'	=> $u_action,
-					'U_ACTION'	=> $u_action . '&amp;id=' . $link_id,
-
 					'S_EDIT'				=> true,
 					'S_LINK_IS_INT'			=> (isset($links[$link_id]['type']) && $links[$link_id]['type'] == self::LINK_INT) ? true : false,
+					'LINK_ID'		=> $link_id,
 				));
 
 				$groups_ary = (isset($links[$link_id]['permission'])) ? explode(',', $links[$link_id]['permission']) : array();
diff --git a/modules/main_menu.php b/modules/main_menu.php
index c2f9dc15..fbbdd5a2 100644
--- a/modules/main_menu.php
+++ b/modules/main_menu.php
@@ -467,8 +467,7 @@ class main_menu extends module_base
 					'LINK_TITLE'	=> (isset($links[$link_id]['title']) && $action != 'add') ? $links[$link_id]['title'] : '',
 					'LINK_URL'		=> (isset($links[$link_id]['url']) && $links[$link_id]['type'] != self::LINK_CAT && $action != 'add') ? str_replace('&', '&amp;', $links[$link_id]['url']) : '',
 
-					//'U_BACK'	=> $u_action,
-					'U_ACTION'	=> $u_action . '&amp;id=' . $link_id,
+					'LINK_ID'		=> $link_id,
 
 					'S_EDIT'				=> true,
 					'S_LINK_IS_CAT'			=> (!isset($links[$link_id]['type']) || $links[$link_id]['type'] == self::LINK_CAT) ? true : false,
diff --git a/tests/functional/portal_acp_test.php b/tests/functional/portal_acp_test.php
index fd2d197b..cd182dd4 100644
--- a/tests/functional/portal_acp_test.php
+++ b/tests/functional/portal_acp_test.php
@@ -97,4 +97,17 @@ class phpbb_functional_portal_acp_test extends \board3\portal\tests\testframewor
 		$crawler = self::submit($form);
 		$this->assertContainsLang('ACL_U_VIEW_PORTAL', $crawler->text());
 	}
+
+	public function test_edit_menu_link()
+	{
+		$this->add_lang_ext('board3/portal', 'info_acp_portal');
+		$crawler = self::request('GET', 'adm/index.php?i=\board3\portal\acp\portal_module&mode=config&module_id=1&action=edit&id=10&sid=' . $this->sid);
+		$form = $crawler->selectButton('submit')->form();
+		$form->setValues(array('link_title'	=> 'foobar'));
+		$crawler = self::submit($form);
+		$crawler = self::request('GET', 'adm/index.php?i=\board3\portal\acp\portal_module&mode=config&module_id=1&sid=' . $this->sid);
+		$this->assertContains('foobar', $crawler->text());
+		$crawler = self::request('GET', 'app.php/portal?sid=' . $this->sid);
+		$this->assertContains('foobar', $crawler->text());
+	}
 }