Index: t3lib/js/extjs/components/pagetree/javascript/actions.js
===================================================================
--- t3lib/js/extjs/components/pagetree/javascript/actions.js	(revision 10312)
+++ t3lib/js/extjs/components/pagetree/javascript/actions.js	(revision )
@@ -281,6 +281,7 @@
 
 				TYPO3.Components.PageTree.Configuration.temporaryMountPoint = response;
 				TYPO3.Backend.NavigationContainer.PageTree.addTemporaryMountPointIndicator();
+				TYPO3.Backend.NavigationContainer.doLayout();
 
 				var selectedNode = TYPO3.Backend.NavigationContainer.PageTree.getSelected();
 				tree.stateId = 'Pagetree' + TYPO3.Components.PageTree.Configuration.temporaryMountPoint;
Index: t3lib/js/extjs/components/pagetree/javascript/app.js
===================================================================
--- t3lib/js/extjs/components/pagetree/javascript/app.js	(revision 10261)
+++ t3lib/js/extjs/components/pagetree/javascript/app.js	(revision )
@@ -64,23 +64,6 @@
 	activeTree: null,
 
 	/**
-	 * Listeners
-	 *
-	 * The afterlayout wizard relayoutes the navigation container to fix some nasty
-	 * scrollbar issues.
-	 *
-	 * @type {Object}
-	 */
-	listeners: {
-		afterlayout: {
-			fn: function() {
-				this.ownerCt.doLayout();
-			},
-			buffer: 250
-		}
-	},
-
-	/**
 	 * Initializes the application
 	 *
 	 * Set's the necessary language labels, configuration options and sprite icons by an
@@ -187,6 +170,7 @@
 			if (TYPO3.Components.PageTree.Configuration.indicator !== '') {
 				this.addIndicatorItems();
 			}
+			this.doLayout();
 		}, this);
 
 		TYPO3.Components.PageTree.App.superclass.initComponent.apply(this, arguments);
@@ -229,6 +213,7 @@
 									this.removeIndicator(this.temporaryMountPointInfoIndicator);
 									this.getTree().refreshTree();
 									this.getTree().stateId = 'Pagetree';
+									TYPO3.Backend.NavigationContainer.PageTree.doLayout();
 								},
 								this
 							);
@@ -250,6 +235,7 @@
 						TYPO3.Components.PageTree.Configuration.temporaryMountPoint +
 				'</p>'
 		});
+		TYPO3.Backend.NavigationContainer.PageTree.doLayout();
 	},
 
 	/**