diff --git a/src/api/objects/RootObjectProvider.js b/src/api/objects/RootObjectProvider.js
index 00c43a215b..3e0d999573 100644
--- a/src/api/objects/RootObjectProvider.js
+++ b/src/api/objects/RootObjectProvider.js
@@ -34,7 +34,7 @@ class RootObjectProvider {
                 composition: []
             };
             RootObjectProvider.instance = this;
-        } else {
+        } else if (rootRegistry) {
             // if called twice, update instance rootRegistry
             RootObjectProvider.instance.rootRegistry = rootRegistry;
         }
diff --git a/src/ui/layout/mct-tree.vue b/src/ui/layout/mct-tree.vue
index f1d969ecdf..fb9632b159 100644
--- a/src/ui/layout/mct-tree.vue
+++ b/src/ui/layout/mct-tree.vue
@@ -451,6 +451,12 @@ export default {
                 this.jumpPath = this.jumpPath[0];
             }
 
+            // switching back and forth between multiple root children can cause issues,
+            // this checks for one of those issues
+            if (this.jumpPath.key) {
+                this.jumpPath = this.jumpPath.key;
+            }
+
             let nodes = this.jumpPath.split('/');
 
             for (let i = 0; i < nodes.length; i++) {