diff --git a/src/css_composer/view/CssRuleView.js b/src/css_composer/view/CssRuleView.js
index 620e9182b..c65f61730 100644
--- a/src/css_composer/view/CssRuleView.js
+++ b/src/css_composer/view/CssRuleView.js
@@ -51,17 +51,21 @@ define(['backbone'],
 
     render : function(){
       var block = '',
-          selStr = '';
-          o = '';
+        selStr = '';
+        o = '';
       if(!this.selStr)
         this.selStr = this.renderSelectors();
       var prpStr = this.renderProperties();
       var stateStr = this.model.get('state');
+      var width = this.model.get('maxWidth');
       if(this.selStr){
         stateStr = stateStr ? ':' + stateStr : '';
         block = prpStr !== '' ? '{' + prpStr + '}' : '';
       }
       o = this.selStr && block ? this.selStr + stateStr + block : '';
+      if(width && o){
+        o = '@media (max-width: ' + width + '){' + o + '}';
+      }
       this.$el.html(o);
       return this;
     },
diff --git a/src/style_manager/view/SectorsView.js b/src/style_manager/view/SectorsView.js
index 3bacc776c..1ee0bd63e 100644
--- a/src/style_manager/view/SectorsView.js
+++ b/src/style_manager/view/SectorsView.js
@@ -41,6 +41,8 @@ define(['backbone', './SectorView'],
 			var classes = el.get('classes');
 			var state = el.get('state');
 			var pt = this.propTarget;
+			var device = this.target.getDeviceModel();
+			var deviceW = device ? device.get('width') : '';
 			pt.helper = null;
 
 			if(classes.length){
@@ -48,10 +50,10 @@ define(['backbone', './SectorView'],
 				var valid = _.filter(classes.models, function(item){
 					return item.get('active');
 				});
-				var iContainer = cssC.getRule(valid, state, '');
+				var iContainer = cssC.getRule(valid, state, deviceW);
 
 				if(!iContainer){
-					iContainer = cssC.newRule(valid, state, '');
+					iContainer = cssC.newRule(valid, state, deviceW);
 					// Hydrate styles from component element
 					iContainer.set('style', el.get('style'));
 					cssC.addRule(iContainer);