diff --git a/pages/UI.php b/pages/UI.php
index b9f2605f6..4b4a2e2ef 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -2159,7 +2159,7 @@ EOF
 		///////////////////////////////////////////////////////////////////////////////////////////
 
 		default: // Menu node rendering (templates)
-		$oMenuNode = ApplicationMenu::GetMenuNode(ApplicationMenu::GetActiveNodeId());
+		$oMenuNode = ApplicationMenu::GetMenuNode(ApplicationMenu::GetMenuIndexById(ApplicationMenu::GetActiveNodeId()));
 		if (is_object($oMenuNode))
 		{
 		
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index 69a5dff2d..fb39bffb5 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -824,7 +824,7 @@ try
 			// navigate to the dashboard page
 			if ($aValues['open_editor'])
 			{
-				$oPage->add_ready_script("window.location.href='".addslashes(utils::GetAbsoluteUrlAppRoot().'pages/UI.php?c[menu]='.$index)."&edit=1';"); // reloads the page, doing a GET even if we arrived via a POST
+				$oPage->add_ready_script("window.location.href='".addslashes(utils::GetAbsoluteUrlAppRoot().'pages/UI.php?c[menu]='.urlencode($sMenuId))."&edit=1';"); // reloads the page, doing a GET even if we arrived via a POST
 			}
 		}
 		break;