Index: typo3/backend.php
===================================================================
--- typo3/backend.php	(revision 3825)
+++ typo3/backend.php	(working copy)
@@ -338,6 +338,8 @@
 	 * Function similar to PHPs  rawurlencode();
 	 */
 	function rawurlencode(str)	{	//
+		var host = "' . t3lib_div::getIndpEnv('TYPO3_REQUEST_HOST') . '";
+		str = str_replace(host,"",str);
 		var output = escape(str);
 		output = str_replace("*","%2A", output);
 		output = str_replace("+","%2B", output);
Index: typo3/classes/class.shortcutmenu.php
===================================================================
--- typo3/classes/class.shortcutmenu.php	(revision 3825)
+++ typo3/classes/class.shortcutmenu.php	(working copy)
@@ -499,7 +499,7 @@
 		$shortcutName        = 'Shortcut'; // default name
 		$shortcutNamePrepend = '';
 
-		$url             = urldecode(t3lib_div::_POST('url'));
+		$url             = t3lib_div::_POST('url');
 		$module          = t3lib_div::_POST('module');
 		$motherModule    = t3lib_div::_POST('motherModName');
 
@@ -523,7 +523,7 @@
 		}
 
 			// Lookup the title of this page and use it as default description
-		$pageId = $this->getLinkedPageId($url);
+		$pageId = $shortcut['recordid'] ? $shortcut['recordid'] : $this->getLinkedPageId($url);
 
 		if(t3lib_div::testInt($pageId)) {
 			$page = t3lib_BEfunc::getRecord('pages', $pageId);