diff --git a/EllesmereUIUnitFrames/EUI_UnitFrames_Options.lua b/EllesmereUIUnitFrames/EUI_UnitFrames_Options.lua
index 53ed537..09b5fac 100644
--- a/EllesmereUIUnitFrames/EUI_UnitFrames_Options.lua
+++ b/EllesmereUIUnitFrames/EUI_UnitFrames_Options.lua
@@ -929,10 +929,11 @@ initFrame:SetScript("OnEvent", function(self)
         pf._healthFill = healthFill
         pf._hR, pf._hG, pf._hB, pf._hA = hR, hG, hB, hA
 
-        -- Text overlay frame (sits above absorb StatusBar)
-        local textOverlay = CreateFrame("Frame", nil, health)
+        -- Text overlay frame (sits above absorb StatusBar and border)
+        local textOverlay = CreateFrame("Frame", nil, pf)
         textOverlay:SetAllPoints(health)
-        textOverlay:SetFrameLevel(health:GetFrameLevel() + 3)
+        textOverlay:SetFrameStrata(pf:GetFrameStrata())
+        textOverlay:SetFrameLevel(math.max(pf:GetFrameLevel() + 20, health:GetFrameLevel() + 12))
 
         -- Left text
         local leftContent = settings.leftTextContent or "name"
diff --git a/EllesmereUIUnitFrames/EllesmereUIUnitFrames.lua b/EllesmereUIUnitFrames/EllesmereUIUnitFrames.lua
index 679849c..0119112 100644
--- a/EllesmereUIUnitFrames/EllesmereUIUnitFrames.lua
+++ b/EllesmereUIUnitFrames/EllesmereUIUnitFrames.lua
@@ -2784,9 +2784,10 @@ local function StyleFullFrame(frame, unit)
     UpdateBordersForScale(frame, unit)
 
     -- Text overlay frame -- sits above the StatusBar for clean text rendering.
-    local textOverlay = CreateFrame("Frame", nil, frame.Health)
+    local textOverlay = CreateFrame("Frame", nil, frame)
     textOverlay:SetAllPoints(frame.Health)
-    textOverlay:SetFrameLevel(frame.Health:GetFrameLevel() + 12)
+    textOverlay:SetFrameStrata(frame:GetFrameStrata())
+    textOverlay:SetFrameLevel(math.max(frame:GetFrameLevel() + 20, frame.Health:GetFrameLevel() + 12))
     frame._textOverlay = textOverlay
 
     local leftContent = settings.leftTextContent or "name"