diff --git a/src/selector_manager/view/ClassTagsView.js b/src/selector_manager/view/ClassTagsView.js
index acaa8cb56..f0ba3d929 100644
--- a/src/selector_manager/view/ClassTagsView.js
+++ b/src/selector_manager/view/ClassTagsView.js
@@ -71,12 +71,6 @@ export default Backbone.View.extend({
     return emitter || {};
   },
 
-  // getSelectedModel() {
-  //   const { em, config } = this;
-  //   const sm = em && em.get('StyleManager');
-  //   return sm && sm.getModelToStyle(em.getSelected());
-  // },
-
   /**
    * Triggered when a tag is removed from collection
    * @param {Object} model Removed model
diff --git a/src/style_manager/index.js b/src/style_manager/index.js
index baad7eda1..b7b668b68 100644
--- a/src/style_manager/index.js
+++ b/src/style_manager/index.js
@@ -265,6 +265,8 @@ export default () => {
         const config = em.getConfig();
         const um = em.get('UndoManager');
         const cssC = em.get('CssComposer');
+        const sm = em.get('SelectorManager');
+        const smConf = sm ? sm.getConfig() : {};
         const state = !config.devicePreviewMode ? model.get('state') : '';
         const valid = classes.getStyleable();
         const hasClasses = valid.length;
@@ -277,7 +279,7 @@ export default () => {
         // #268
         um.stop();
 
-        if (hasClasses) {
+        if (hasClasses && !smConf.componentFirst) {
           const deviceW = em.getCurrentMedia();
           rule = cssC.get(valid, state, deviceW);