diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java
index 0a5144fd9..cdc7afd6f 100644
--- a/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java
+++ b/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java
@@ -280,10 +280,9 @@ public class KamiGUI extends GUI {
         Frame finalFrame = frame;
         friends.addTickListener(() -> {
             friends.setText("");
+            friends.setWidth(50);
             if (!finalFrame.isMinimized()) {
                 Friends.friends.getValue().forEach(friend -> friends.addLine(friend.getUsername()));
-            } else {
-                friends.setWidth(50);
             }
         });
 
diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/chat/FriendHighlight.kt b/src/main/java/me/zeroeightsix/kami/module/modules/chat/FriendHighlight.kt
index 23998351d..40c95bbe4 100644
--- a/src/main/java/me/zeroeightsix/kami/module/modules/chat/FriendHighlight.kt
+++ b/src/main/java/me/zeroeightsix/kami/module/modules/chat/FriendHighlight.kt
@@ -36,9 +36,9 @@ class FriendHighlight : Module() {
     @EventHandler
     var listener = Listener(EventHook { event: ClientChatReceivedEvent ->
         if (mc.player == null || noFriendsCheck()) return@EventHook
-        val converted = arrayOf("")
-        Friends.friends.value.forEach(Consumer { friend: Friend -> converted[0] = event.message.formattedText.replace("(?i)" + friend.username.toRegex(), colour() + bold() + friend.username + TextFormatting.RESET.toString()) })
-        val message = TextComponentString(converted[0])
+        var converted = event.message.formattedText
+        Friends.friends.value.forEach(Consumer { friend: Friend -> converted = converted.replace(friend.username.toRegex(RegexOption.IGNORE_CASE), colour() + bold() + friend.username + TextFormatting.RESET.toString()) })
+        val message = TextComponentString(converted)
         event.message = message
     })