diff --git a/src/plugins/displayLayout/components/SubobjectView.vue b/src/plugins/displayLayout/components/SubobjectView.vue
index 17e42ff0ec..cc1c838d5a 100644
--- a/src/plugins/displayLayout/components/SubobjectView.vue
+++ b/src/plugins/displayLayout/components/SubobjectView.vue
@@ -26,7 +26,8 @@
         <object-frame v-if="domainObject"
                       :domain-object="domainObject"
                       :object-path="objectPath"
-                      :has-frame="item.hasFrame">
+                      :has-frame="item.hasFrame"
+                      ref="objectFrame">
         </object-frame>
     </layout-frame>
 </template>
@@ -98,13 +99,15 @@
             setObject(domainObject) {
                 this.domainObject = domainObject;
                 this.objectPath = [this.domainObject].concat(this.openmct.router.path);
-                this.context = {
-                    item: domainObject,
-                    layoutItem: this.item,
-                    index: this.index
-                };
-                this.removeSelectable = this.openmct.selection.selectable(
-                    this.$el, this.context, this.initSelect);
+                this.$nextTick(function () {
+                    let childContext = this.$refs.objectFrame.getSelectionContext();
+                    childContext.item = domainObject;
+                    childContext.layoutItem = this.item;
+                    childContext.index = this.index;
+                    this.context = childContext;
+                    this.removeSelectable = this.openmct.selection.selectable(
+                        this.$el, this.context, this.initSelect);
+                });
             }
         },
         mounted() {
diff --git a/src/plugins/flexibleLayout/components/frame.vue b/src/plugins/flexibleLayout/components/frame.vue
index 77286d4c00..308b894c3d 100644
--- a/src/plugins/flexibleLayout/components/frame.vue
+++ b/src/plugins/flexibleLayout/components/frame.vue
@@ -35,7 +35,8 @@
                 v-if="domainObject"
                 :domain-object="domainObject"
                 :object-path="objectPath"
-                :has-frame="hasFrame">
+                :has-frame="hasFrame"
+                ref="objectFrame">
             </object-frame>
 
             <div class="c-fl-frame__size-indicator"
@@ -78,14 +79,14 @@ export default {
             this.setSelection();
         },
         setSelection() {
-            let context = {
-                item: this.domainObject,
-                addContainer: this.addContainer,
-                type: 'frame',
-                frameId: this.frame.id
-            };
-
-            this.unsubscribeSelection = this.openmct.selection.selectable(this.$refs.frame, context, false);
+            this.$nextTick(function () {
+                let childContext = this.$refs.objectFrame.getSelectionContext();
+                childContext.item = this.domainObject;
+                childContext.type = 'frame';
+                childContext.frameId = this.frame.id;
+                this.unsubscribeSelection = this.openmct.selection.selectable(
+                    this.$refs.frame, childContext, false);
+            });
         },
         initDrag(event) {
             let type = this.openmct.types.get(this.domainObject.type),
diff --git a/src/plugins/flexibleLayout/toolbarProvider.js b/src/plugins/flexibleLayout/toolbarProvider.js
index 28cff65e93..b2a265509c 100644
--- a/src/plugins/flexibleLayout/toolbarProvider.js
+++ b/src/plugins/flexibleLayout/toolbarProvider.js
@@ -53,7 +53,7 @@ function ToolbarProvider(openmct) {
             toggleContainer = {
                 control: 'toggle-button',
                 key: 'toggle-layout',
-                domainObject: secondary ? secondary.context.item : primary.context.item,
+                domainObject: primary.context.item,
                 property: 'configuration.rowsLayout',
                 options: [
                     {
@@ -140,6 +140,8 @@ function ToolbarProvider(openmct) {
                     title: 'Add Container'
                 };
 
+                toggleContainer.domainObject = secondary.context.item;
+
             } else if (primary.context.type === 'container') {
 
                 deleteContainer = {
diff --git a/src/ui/components/ObjectFrame.vue b/src/ui/components/ObjectFrame.vue
index 85ff68a8ef..8250274548 100644
--- a/src/ui/components/ObjectFrame.vue
+++ b/src/ui/components/ObjectFrame.vue
@@ -129,6 +129,10 @@
             objectPath: Array,
             hasFrame: Boolean,
         },
+        components: {
+            ObjectView,
+            ContextMenuDropDown,
+        },
         methods: {
             expand() {
                 let objectView = this.$refs.objectView,
@@ -142,12 +146,11 @@
                         parentElement.append(childElement);
                     }
                 });
+            },
+            getSelectionContext() {
+                return this.$refs.objectView.getSelectionContext();
             }
         },
-        components: {
-            ObjectView,
-            ContextMenuDropDown,
-        },
         data() {
             let objectType = this.openmct.types.get(this.domainObject.type),
                 cssClass = objectType && objectType.definition ? objectType.definition.cssClass : 'icon-object-unknown',
diff --git a/src/ui/components/ObjectView.vue b/src/ui/components/ObjectView.vue
index f809247dee..03f08e0c30 100644
--- a/src/ui/components/ObjectView.vue
+++ b/src/ui/components/ObjectView.vue
@@ -40,6 +40,11 @@ export default {
             }
             delete this.viewContainer;
             delete this.currentView;
+
+            if (this.removeSelectable) {
+                this.removeSelectable();
+                delete this.removeSelectable;
+            }
         },
         updateView(immediatelySelect) {
             this.clear();
@@ -61,12 +66,7 @@ export default {
 
             if (immediatelySelect) {
                 this.removeSelectable = openmct.selection.selectable(
-                    this.$el,
-                    this.currentView.getSelectionContext ?
-                        this.currentView.getSelectionContext() :
-                        { item: this.currentObject },
-                    true
-                );
+                    this.$el, this.getSelectionContext(), true);
             }
         },
         show(object, viewKey, immediatelySelect) {
@@ -87,6 +87,13 @@ export default {
             this.viewKey = viewKey;
             this.updateView(immediatelySelect);
         },
+        getSelectionContext() {
+            if (this.currentView.getSelectionContext) {
+                return this.currentView.getSelectionContext();
+            } else {
+                return { item: this.currentObject };
+            }
+        },
         onDragOver(event) {
             if (this.hasComposableDomainObject(event)) {
                 event.preventDefault();
diff --git a/src/ui/inspector/Inspector.vue b/src/ui/inspector/Inspector.vue
index 9823086e21..91213c52c2 100644
--- a/src/ui/inspector/Inspector.vue
+++ b/src/ui/inspector/Inspector.vue
@@ -235,7 +235,7 @@
                 if (selection[0]) {
                     let parentObject = selection[0].context.item;
 
-                    this.hasComposition = !!this.openmct.composition.get(parentObject);
+                    this.hasComposition = !!(parentObject && this.openmct.composition.get(parentObject));
                 }
             }
         },