diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlLabeledPeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlLabeledPeer.java
index 9121d7b20..cbdf90bbe 100644
--- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlLabeledPeer.java
+++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlLabeledPeer.java
@@ -89,10 +89,10 @@ public void updateTextFill(Paint textFill) {
 
     @Override
     public void updateWrapText(boolean wrapText) {
-        //if (doesSkinRelyOnPeerToProvideVisualContent()) { // Commented as we want the expected code below to be applied on Label (check if this test should be definitely removed)
+        if (doesSkinRelyOnPeerToProvideVisualContent()) { // Note: for LabeledSkinBase, the wrapping is done though its internal Text node having a wrapping width -> see HtmlTextPeer.updateWrappingWidth()
             setElementStyleAttribute("white-space", wrapText ? "normal" : "nowrap");
             //setElementStyleAttribute("line-height", wrapText ? "normal" : "100%"); // Commented as not sure about line-height: 100% when not wrapping text TODO: investigate the expected height in JavaFX
-        //}
+        }
     }
 
 }
diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlTextPeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlTextPeer.java
index 24f34d6c3..ef848caf8 100644
--- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlTextPeer.java
+++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlTextPeer.java
@@ -155,6 +155,8 @@ public void updateWrappingWidth(Double wrappingWidth) {
         double width = Numbers.doubleValue(wrappingWidth);
         if (width != 0)
             setElementStyleAttribute("width", toPx(width));
+        // Setting the wrapping mode in HTML through white-space style attribute
+        setElementStyleAttribute("white-space", width != 0 ? "normal" : "nowrap");
         clearCache();
         updateYOnNextPulse();
     }