diff --git a/src/css_composer/index.js b/src/css_composer/index.js
index c4d9c27ae..07b6aac93 100644
--- a/src/css_composer/index.js
+++ b/src/css_composer/index.js
@@ -257,8 +257,8 @@ export default () => {
      * Remove all rules
      * @return {this}
      */
-    clear() {
-      this.getAll().reset();
+    clear(opts = {}) {
+      this.getAll().reset(null, opts);
       return this;
     },
 
diff --git a/src/editor/model/Editor.js b/src/editor/model/Editor.js
index a835cbe5f..a013a3089 100644
--- a/src/editor/model/Editor.js
+++ b/src/editor/model/Editor.js
@@ -453,14 +453,14 @@ export default Backbone.Model.extend({
   /**
    * Set style inside editor's canvas. This method overrides actual style
    * @param {Object|string} style CSS string or style model
-   * @param {Object} opt the options object to be used by the [CssRules.add]{@link rules#add} method
+   * @param {Object} opt the options object to be used by the `CssRules.add` method
    * @return {this}
    * @private
    */
   setStyle(style, opt = {}) {
-    var rules = this.get('CssComposer').getAll();
-    for (var i = 0, len = rules.length; i < len; i++) rules.pop();
-    rules.add(style, opt);
+    const cssc = this.get('CssComposer');
+    cssc.clear(opt);
+    cssc.getAll().add(style, opt);
     return this;
   },