diff --git a/src/commands/view/OpenStyleManager.js b/src/commands/view/OpenStyleManager.js
index 172262af8..85cc14a42 100644
--- a/src/commands/view/OpenStyleManager.js
+++ b/src/commands/view/OpenStyleManager.js
@@ -45,7 +45,7 @@ module.exports = {
       this.panel.set('appendContent', this.$cn).trigger('change:appendContent');
 
       this.target = em.editor;
-      this.listenTo(this.target, 'component:selected', this.toggleSm);
+      this.listenTo(this.target, 'component:toggled', this.toggleSm);
     }
     this.toggleSm();
   },
@@ -55,10 +55,10 @@ module.exports = {
    * @private
    */
   toggleSm() {
-    const sender = this.sender;
+    const { target, sender } = this;
     if (sender && sender.get && !sender.get('active')) return;
 
-    if (this.target.getSelected()) {
+    if (target.getSelectedAll().length === 1) {
       this.$cn2.show();
       this.$header.hide();
     } else {
diff --git a/src/commands/view/OpenTraitManager.js b/src/commands/view/OpenTraitManager.js
index 779796759..ea212d83b 100644
--- a/src/commands/view/OpenTraitManager.js
+++ b/src/commands/view/OpenTraitManager.js
@@ -48,7 +48,7 @@ module.exports = {
     const sender = this.sender;
     if (sender && sender.get && !sender.get('active')) return;
 
-    if (this.target.getSelected()) {
+    if (this.target.getSelectedAll().length === 1) {
       this.$cn2.show();
       this.$header.hide();
     } else {
diff --git a/src/trait_manager/view/TraitsView.js b/src/trait_manager/view/TraitsView.js
index 069e29187..295ff4258 100644
--- a/src/trait_manager/view/TraitsView.js
+++ b/src/trait_manager/view/TraitsView.js
@@ -23,7 +23,7 @@ module.exports = DomainViews.extend({
     this.pfx = config.stylePrefix || '';
     this.ppfx = config.pStylePrefix || '';
     this.className = this.pfx + 'traits';
-    const toListen = 'component:selected';
+    const toListen = 'component:toggled';
     this.listenTo(this.em, toListen, this.updatedCollection);
     this.updatedCollection();
   },