Index: typo3/classes/class.modulemenu.php
===================================================================
--- typo3/classes/class.modulemenu.php	(revision 7442)
+++ typo3/classes/class.modulemenu.php	(working copy)
@@ -515,7 +515,7 @@
 					top.content.nav_frame.location = top.getModuleUrl(top.TS.PATH_typo3 + navFrames[mainModName]);
 				}
 			} else {
-				TYPO3.Backend.loadModule(mainModName, modName, top.getModuleUrl(modScriptURL));
+				TYPO3.Backend.loadModule(mainModName, modName, modScriptURL + additionalGetVariables);
 			}
 		} else if (modScriptURL) {
 			TYPO3.Backend.loadModule(mainModName, modName, top.getModuleUrl(modScriptURL + additionalGetVariables));
Index: typo3/js/extjs/viewport.js
===================================================================
--- typo3/js/extjs/viewport.js	(revision 7442)
+++ typo3/js/extjs/viewport.js	(working copy)
@@ -77,13 +77,12 @@
 	/**
 	 * Initializes the ExtJS viewport with the given configuration.
 	 *
-	 * @param configuration object configuration of the viewport
 	 * @return void
 	 */
 	initComponent: function() {
-		//adjust the width of module menu
+		// adjust the width of module menu
 		this.initialConfig.items[1].width = TYPO3.configuration.moduleMenuWidth;
-		//call parent constructor
+		// call parent constructor
 		TYPO3.Viewport.superclass.initComponent.apply(this, arguments);
 
 		this.ContentContainer = Ext.ComponentMgr.get('typo3-contentContainer');
@@ -127,9 +126,13 @@
 			this.NavigationContainer.hide();
 		}
 
-		// top.currentSubScript
+		// append the typo3 path if it wasn't already applied
+		// this is important for backwards compatibility (e.g. shortcuts)
+		if (contentScript.indexOf(top.TS.PATH_typo3) !== 0) {
+			contentScript = top.TS.PATH_typo3 + contentScript;
+		}
 		Ext.get('content').set({
-			src: top.TS.PATH_typo3 + contentScript
+			src: contentScript
 		});
 
 		this.NavigationContainer.ownerCt.doLayout();