diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/ContextMenuActions.js b/typo3/sysext/backend/Resources/Public/JavaScript/ContextMenuActions.js
index 41ff48d660972c36482a627336fc1cdf0018ba0c..6d6ed48943685afb1118f99c0329e3a877872627 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/ContextMenuActions.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/ContextMenuActions.js
@@ -47,8 +47,8 @@ define(['jquery', 'TYPO3/CMS/Backend/Modal', 'TYPO3/CMS/Backend/Severity'], func
     ContextMenuActions.mountAsTreeRoot = function (table, uid) {
         // see actions.js -> mountAsTreeRoot
         if (table === 'pages' && typeof top.Ext.getCmp('typo3-pagetree') !== 'undefined') {
-            var node = top.Ext.getCmp('typo3-pagetree-tree').app.getSelected();
-            // var node = top.TYPO3.Backend.NavigationContainer.PageTree.getSelected();
+            var app = top.Ext.getCmp('typo3-pagetree-tree').app;
+            var node = app.getTree().getRootNode().findChild('realId', uid, true);
             if (node === null) {
                 return false;
             }
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/extjs/components/pagetree/javascript/actions.js b/typo3/sysext/backend/Resources/Public/JavaScript/extjs/components/pagetree/javascript/actions.js
index 2cfc3c4392902c3846a0f753b785f4ec84002937..8c6229b74511cbe1844bfdfe515de7454e8aa972 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/extjs/components/pagetree/javascript/actions.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/extjs/components/pagetree/javascript/actions.js
@@ -276,26 +276,27 @@ require(['TYPO3/CMS/Backend/Utility'], function(Utility) {
 			TYPO3.Components.PageTree.Commands.setTemporaryMountPoint(
 				node.attributes.nodeData,
 				function (response) {
+					var app = Ext.getCmp('typo3-pagetree-tree').app;
 					if (TYPO3.Components.PageTree.Configuration.temporaryMountPoint) {
-						TYPO3.Backend.NavigationContainer.PageTree.removeIndicator(
-							TYPO3.Backend.NavigationContainer.PageTree.temporaryMountPointInfoIndicator
+						app.removeIndicator(
+							app.temporaryMountPointInfoIndicator
 						);
 					}
 
 					TYPO3.Components.PageTree.Configuration.temporaryMountPoint = response;
-					Ext.getCmp('typo3-pagetree-tree').app.addTemporaryMountPointIndicator();
+					app.addTemporaryMountPointIndicator();
 
-					var selectedNode = Ext.getCmp('typo3-pagetree-tree').app.getSelected();
+					var selectedNode = app.getSelected();
 					tree.stateId = 'Pagetree' + TYPO3.Components.PageTree.Configuration.temporaryMountPoint;
 					tree.refreshTree(function () {
 						var nodeIsSelected = false;
 						if (selectedNode) {
-							nodeIsSelected = TYPO3.Backend.NavigationContainer.PageTree.select(
+							nodeIsSelected = app.select(
 								selectedNode.attributes.nodeData.id
 							);
 						}
 
-						var node = (nodeIsSelected ? TYPO3.Backend.NavigationContainer.PageTree.getSelected() : null);
+						var node = (nodeIsSelected ? app.getSelected() : null);
 						if (node) {
 							this.singleClick(node, tree);
 						} else {