diff --git a/src/plugins/showMeYourName/index.tsx b/src/plugins/showMeYourName/index.tsx
index d4ffeefd31..4cbdd224b4 100644
--- a/src/plugins/showMeYourName/index.tsx
+++ b/src/plugins/showMeYourName/index.tsx
@@ -11,6 +11,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
import { Devs } from "@utils/constants";
import definePlugin, { OptionType } from "@utils/types";
import { Channel, Message, User } from "@vencord/discord-types";
+import { findByCodeLazy } from "@webpack";
import { RelationshipStore, StreamerModeStore } from "@webpack/common";
interface UsernameProps {
@@ -22,6 +23,8 @@ interface UsernameProps {
userOverride?: User;
}
+const wrapEmojis = findByCodeLazy("lastIndex;return");
+
const settings = definePluginSettings({
mode: {
type: OptionType.SELECT,
@@ -104,8 +107,9 @@ export default definePlugin({
if (mode === "user-nick")
return <>{prefix}{username} {nick}>;
- if (mode === "nick-user")
- return <>{prefix}{nick} {username}>;
+ if (mode === "nick-user") {
+ return <>{prefix}{wrapEmojis(nick)} {username}>;
+ }
return <>{prefix}{username}>;
} catch {