diff --git a/contribs/gmf/src/layertree/common.less b/contribs/gmf/src/layertree/common.less
index a56c723880e4..a9aac4967c8f 100644
--- a/contribs/gmf/src/layertree/common.less
+++ b/contribs/gmf/src/layertree/common.less
@@ -50,8 +50,7 @@
     color: @color;
   }
 
-  .off,
-  .off .gmf-layertree-legend img {
+  .off {
     opacity: 0.5;
   }
 
@@ -159,6 +158,9 @@
     position: relative;
     border: 1px solid @main-bg-color;
     background-color: lighten(@main-bg-color, 8%);
+    .off {
+      opacity: 0.5;
+    }
     a {
       display: none;
       position: absolute;
diff --git a/contribs/gmf/src/layertree/component.html b/contribs/gmf/src/layertree/component.html
index c12cf0166d15..fbf74ca2893b 100644
--- a/contribs/gmf/src/layertree/component.html
+++ b/contribs/gmf/src/layertree/component.html
@@ -223,7 +223,7 @@
 <div
   ng-if="::!layertreeCtrl.isRoot && gmfLayertreeCtrl.getLegendsObject(layertreeCtrl) && layertreeCtrl.node.metadata.legend" id="gmf-layertree-node-{{::layertreeCtrl.uid}}-legend"
   class="collapse gmf-layertree-legend"
-  ng-class="::[layertreeCtrl.node.metadata.isLegendExpanded ? 'in' : '']">
+  ng-class="[gmfLayertreeCtrl.getNodeState(layertreeCtrl), layertreeCtrl.node.metadata.isLegendExpanded ? 'in' : '']">
 
   <a
     title="{{'Hide legend'|translate}}"