diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp
index bfbe6d0..d30883a 100644
--- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp
+++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp
@@ -1218,7 +1218,7 @@ void LookAndFeel_V2::drawComboBoxTextWhenNothingSelected (Graphics& g, ComboBox&
 
     g.setFont (font);
 
-    auto textArea = label.getBorderSize().subtractedFrom (label.getLocalBounds());
+    auto textArea = getLabelBorderSize (label).subtractedFrom (label.getLocalBounds());
 
     g.drawFittedText (box.getTextWhenNothingSelected(), textArea, label.getJustificationType(),
                       jmax (1, (int) (textArea.getHeight() / font.getHeight())),
diff --git a/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp b/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp
index 162f665..adaaf12 100644
--- a/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp
+++ b/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp
@@ -95,9 +95,10 @@ public:
     void paintOverChildren (Graphics& g) override
     {
         if (getText().isEmpty() && ! isBeingEdited())
-        {
-            auto textArea = getBorderSize().subtractedFrom (getLocalBounds());
-            auto labelFont = owner.getLookAndFeel().getLabelFont (*this);
+        {
+            auto& lnf = owner.getLookAndFeel();
+            auto textArea = lnf.getLabelBorderSize (*this).subtractedFrom (getLocalBounds());
+            auto labelFont = lnf.getLabelFont (*this);
 
             g.setColour (owner.findColour (TextPropertyComponent::textColourId).withAlpha (alphaToUseForEmptyText));
             g.setFont (labelFont);
diff --git a/modules/juce_gui_basics/widgets/juce_Label.cpp b/modules/juce_gui_basics/widgets/juce_Label.cpp
index a7a1851..b0124e7 100644
--- a/modules/juce_gui_basics/widgets/juce_Label.cpp
+++ b/modules/juce_gui_basics/widgets/juce_Label.cpp
@@ -156,19 +156,18 @@ void Label::attachToComponent (Component* owner, bool onLeft)
 void Label::componentMovedOrResized (Component& component, bool /*wasMoved*/, bool /*wasResized*/)
 {
     auto f = getLookAndFeel().getLabelFont (*this);
+    auto borderSize = getLookAndFeel().getLabelBorderSize (*this);
 
     if (leftOfOwnerComp)
     {
         auto width = jmin (roundToInt (f.getStringWidthFloat (textValue.toString()) + 0.5f)
-                             + getBorderSize().getLeftAndRight(),
+                             + borderSize.getLeftAndRight(),
                            component.getX());
-
         setBounds (component.getX() - width, component.getY(), width, component.getHeight());
     }
     else
     {
-        auto height = getBorderSize().getTopAndBottom() + 6 + roundToInt (f.getHeight() + 0.5f);
-
+        auto height = borderSize.getTopAndBottom() + 6 + roundToInt (f.getHeight() + 0.5f);
         setBounds (component.getX(), component.getY() - height, component.getWidth(), height);
     }
 }