diff --git a/src/selector_manager/view/ClassTagsView.js b/src/selector_manager/view/ClassTagsView.js
index 0900555bb..93b5a545d 100644
--- a/src/selector_manager/view/ClassTagsView.js
+++ b/src/selector_manager/view/ClassTagsView.js
@@ -70,13 +70,10 @@ export default Backbone.View.extend({
     this.em = em;
 
     const toList = 'component:toggled component:update:classes';
+    const toListCls = 'component:update:classes change:state';
     this.listenTo(em, toList, this.componentChanged);
     this.listenTo(emitter, 'styleManager:update', this.componentChanged);
-    this.listenTo(
-      em,
-      'component:update:classes change:state',
-      this.updateSelector
-    );
+    this.listenTo(em, toListCls, this.__handleStateChange);
     this.listenTo(em, 'styleable:change change:device', this.checkSync); // component:styleUpdate
     this.listenTo(coll, 'add', this.addNew);
     this.listenTo(coll, 'reset', this.renderClasses);
@@ -277,6 +274,10 @@ export default Backbone.View.extend({
     this.updateSelector(target);
   },
 
+  __handleStateChange() {
+    this.updateSelector(this.getTargets());
+  },
+
   /**
    * Update selector helper
    * @return {this}