diff --git a/src/style_manager/index.js b/src/style_manager/index.js
index be207fc3d..160f391b7 100644
--- a/src/style_manager/index.js
+++ b/src/style_manager/index.js
@@ -370,20 +370,22 @@ export default () => {
         const optsSel = { combination: true, array: true };
         let cmpRules = [];
         let otherRules = [];
+        let rules = [];
 
         // Componente related rule
         if (cmp) {
           cmpRules = cssC.getRules(`#${cmp.getId()}`);
           otherRules = cssC.getRules(sel.getSelectors().getFullName(optsSel));
+          rules = otherRules.concat(cmpRules);
         } else {
           cmpRules = cssC.getRules(`#${sel.getId()}`);
           otherRules = cssC.getRules(
             target.getSelectors().getFullName(optsSel)
           );
+          rules = cmpRules.concat(otherRules);
         }
 
-        const all = cmpRules
-          .concat(otherRules)
+        const all = rules
           .filter(rule =>
             !isUndefined(state) ? rule.get('state') === state : 1
           )
@@ -392,11 +394,6 @@ export default () => {
 
         // Slice removes rules not related to the current device
         result = all.slice(all.indexOf(target) + 1);
-        console.log({
-          target: target.toCSS(),
-          all: all.map(r => r.toCSS()),
-          result: result.map(r => r.toCSS())
-        });
       }
 
       return result;
diff --git a/test/specs/style_manager/index.js b/test/specs/style_manager/index.js
index 573cf061e..0e20f5ed5 100644
--- a/test/specs/style_manager/index.js
+++ b/test/specs/style_manager/index.js
@@ -177,6 +177,19 @@ describe('StyleManager', () => {
         expect(obj.getSelectedParents()).toEqual([rule2]);
       });
 
+      test('With ID + class, component first', () => {
+        sm.setComponentFirst(true);
+        const cmp = domc.addComponent(`<div class="cls" id="id-test"></div>`);
+        const [rule1, rule2] = cssc.addRules(`
+          .cls { color: red; }
+          #id-test { color: blue; }
+        `);
+        em.setSelected(cmp);
+        obj.__upSel();
+        expect(obj.getLastSelected()).toBe(rule2);
+        expect(obj.getSelectedParents()).toEqual([rule1]);
+      });
+
       test('With ID + class, multiple devices', () => {
         sm.setComponentFirst(true);
         const cmp = domc.addComponent(`<div class="cls" id="id-test"></div>`);