diff --git a/src/dom_components/index.js b/src/dom_components/index.js
index 019f6d0d2..617287e0a 100644
--- a/src/dom_components/index.js
+++ b/src/dom_components/index.js
@@ -513,12 +513,11 @@ module.exports = () => {
       const previousModel = em.previous('selectedComponent');
 
       // Deselect the previous component
-      if (previousModel) {
+      previousModel &&
         previousModel.set({
           status: '',
           state: ''
         });
-      }
 
       model && model.set('status', 'selected');
     }
diff --git a/src/editor/model/Editor.js b/src/editor/model/Editor.js
index 08ca0a19b..b364d2f35 100644
--- a/src/editor/model/Editor.js
+++ b/src/editor/model/Editor.js
@@ -197,6 +197,9 @@ module.exports = Backbone.Model.extend({
    * @private
    * */
   componentSelected(model, val, options) {
+    const previous = this.previous('selectedComponent');
+    console.log('previous', previous, previous && previous.get('status'));
+
     if (!this.get('selectedComponent')) {
       this.trigger('deselect-comp');
     } else {