diff --git a/index.html b/index.html
index f1b3b2cfe..97d546303 100755
--- a/index.html
+++ b/index.html
@@ -14,6 +14,7 @@
 
     <div id="gjs" style="height:0px; overflow:hidden">
       <header class="header-banner">
+        <div style="color:red; width: 300px;">TEST</div>
         <div class="container-width">
           <!--
           <table>
diff --git a/src/dom_components/model/Components.js b/src/dom_components/model/Components.js
index fb4806b83..4e245e0fd 100644
--- a/src/dom_components/model/Components.js
+++ b/src/dom_components/model/Components.js
@@ -64,8 +64,9 @@ define([ 'backbone', 'require'],
 
       onAdd: function(model, c, opts){
         var style = model.get('style');
+        var em = this.editor;
 
-        if(!_.isEmpty(style) && this.editor){
+        if(!_.isEmpty(style) && em && em.get('Config').forceClass){
           var cssC = this.editor.get('CssComposer');
           var newClass = this.editor.get('SelectorManager').add(model.cid);
           model.set({style:{}});
diff --git a/src/editor/config/config.js b/src/editor/config/config.js
index 814219b97..5a9e52848 100644
--- a/src/editor/config/config.js
+++ b/src/editor/config/config.js
@@ -29,6 +29,10 @@ define(function () {
     // Return JS of components inside HTML from 'editor.getHtml()'
     jsInHtml: true,
 
+    // On creation of a new Component (via object), if the 'style' attribute is not
+    // empty, all those roles will be moved in its new class
+    forceClass: true,
+
     // Height for the editor container
     height: '900px',