diff --git a/src/css_composer/view/CssRulesView.js b/src/css_composer/view/CssRulesView.js
index 01c4b102d..6bf40869d 100644
--- a/src/css_composer/view/CssRulesView.js
+++ b/src/css_composer/view/CssRulesView.js
@@ -86,11 +86,13 @@ module.exports = require('backbone').View.extend({
       const container = fragment || this.el;
       let contRules;
 
-      // Try to find a specific container for the rule, if it
-      // containes a media query
+      // Try to find a specific container for the rule (if it
+      // containes a media query), otherwise get the default one
       try {
         contRules = container.querySelector(`#${blockId}`);
-      } catch (e) {
+      } catch (e) {}
+
+      if (!contRules) {
         contRules = container.querySelector(`#${defaultBlockId}`);
       }
 
diff --git a/test/specs/css_composer/view/CssRulesView.js b/test/specs/css_composer/view/CssRulesView.js
index a6f81bc49..7a9c3710c 100644
--- a/test/specs/css_composer/view/CssRulesView.js
+++ b/test/specs/css_composer/view/CssRulesView.js
@@ -85,7 +85,11 @@ module.exports = {
             mediaText: '(max-width: 1000px)'
           },
           {
-            selectorsAdd: '#testid2',
+            selectorsAdd: '#testid3',
+            mediaText: '(min-width: 900px)'
+          },
+          {
+            selectorsAdd: '#testid4',
             mediaText: 'screen and (max-width: 900px) and (min-width: 600px)'
           }
         ];