diff --git a/src/css_composer/index.js b/src/css_composer/index.js
index 337209356..c78d681c7 100644
--- a/src/css_composer/index.js
+++ b/src/css_composer/index.js
@@ -109,10 +109,10 @@ module.exports = () => {
       const ev = 'change:style';
       const um = em.get('UndoManager');
       um && um.add(model);
-      !opts.avoidStore && em.handleUpdates('', '', opts);
       const handleUpdates = em.handleUpdates.bind(em);
       em.stopListening(model, ev, handleUpdates);
       em.listenTo(model, ev, handleUpdates);
+      !opts.avoidStore && handleUpdates('', '', opts);
     },
 
     /**