diff --git a/src/main/java/net/minecraftforge/client/gui/widget/ExtendedButton.java b/src/main/java/net/minecraftforge/client/gui/widget/ExtendedButton.java
index ac7201b6f6..5b216b18db 100644
--- a/src/main/java/net/minecraftforge/client/gui/widget/ExtendedButton.java
+++ b/src/main/java/net/minecraftforge/client/gui/widget/ExtendedButton.java
@@ -40,7 +40,7 @@ public class ExtendedButton extends Button
     public void renderButton(PoseStack poseStack, int mouseX, int mouseY, float partialTick)
     {
         Minecraft mc = Minecraft.getInstance();
-        int k = this.getYImage(this.isHovered);
+        int k = this.getYImage(this.isHoveredOrFocused());
         ScreenUtils.blitWithBorder(poseStack, WIDGETS_LOCATION, this.getX(), this.getY(), 0, 46 + k * 20, this.width, this.height, 200, 20, 2, 3, 2, 2, this.getBlitOffset());
         this.renderBg(poseStack, mc, mouseX, mouseY);
 
diff --git a/src/main/java/net/minecraftforge/client/gui/widget/UnicodeGlyphButton.java b/src/main/java/net/minecraftforge/client/gui/widget/UnicodeGlyphButton.java
index 6efadeba9b..f26c2025c1 100644
--- a/src/main/java/net/minecraftforge/client/gui/widget/UnicodeGlyphButton.java
+++ b/src/main/java/net/minecraftforge/client/gui/widget/UnicodeGlyphButton.java
@@ -35,7 +35,7 @@ public class UnicodeGlyphButton extends ExtendedButton
         {
             Minecraft mc = Minecraft.getInstance();
             this.isHovered = mouseX >= this.getX() && mouseY >= this.getY() && mouseX < this.getX() + this.width && mouseY < this.getY() + this.height;
-            int k = this.getYImage(this.isHovered);
+            int k = this.getYImage(this.isHoveredOrFocused());
             ScreenUtils.blitWithBorder(poseStack, WIDGETS_LOCATION, this.getX(), this.getY(), 0, 46 + k * 20, this.width, this.height, 200, 20, 2, 3, 2, 2, this.getBlitOffset());
             this.renderBg(poseStack, mc, mouseX, mouseY);