diff --git a/ts/components/AvatarPopup.tsx b/ts/components/AvatarPopup.tsx
index 48157ee55..9171d6d5e 100644
--- a/ts/components/AvatarPopup.tsx
+++ b/ts/components/AvatarPopup.tsx
@@ -9,6 +9,7 @@ import { Avatar } from './Avatar';
 import { useRestoreFocus } from '../hooks/useRestoreFocus';
 
 import type { LocalizerType, ThemeType } from '../types/Util';
+import { Emojify } from './conversation/Emojify';
 
 export type Props = {
   readonly i18n: LocalizerType;
@@ -59,7 +60,7 @@ export const AvatarPopup = (props: Props): JSX.Element => {
         <Avatar {...props} size={52} />
         <div className="module-avatar-popup__profile__text">
           <div className="module-avatar-popup__profile__name">
-            {profileName || title}
+            <Emojify text={profileName || title} />
           </div>
           {shouldShowNumber ? (
             <div className="module-avatar-popup__profile__number">
diff --git a/ts/components/ProfileEditor.tsx b/ts/components/ProfileEditor.tsx
index 742c72943..3bf9f93e3 100644
--- a/ts/components/ProfileEditor.tsx
+++ b/ts/components/ProfileEditor.tsx
@@ -39,6 +39,7 @@ import { Spinner } from './Spinner';
 import { UsernameSaveState } from '../state/ducks/conversationsEnums';
 import { MAX_USERNAME, MIN_USERNAME } from '../types/Username';
 import { isWhitespace, trim } from '../util/whitespaceStringUtil';
+import { Emojify } from './conversation/Emojify';
 
 export enum EditState {
   None = 'None',
@@ -736,7 +737,7 @@ export const ProfileEditor = ({
           icon={
             <i className="ProfileEditor__icon--container ProfileEditor__icon ProfileEditor__icon--name" />
           }
-          label={getFullNameText()}
+          label={<Emojify text={getFullNameText()} />}
           onClick={() => {
             setEditState(EditState.ProfileName);
           }}
@@ -786,7 +787,9 @@ export const ProfileEditor = ({
               <i className="ProfileEditor__icon--container ProfileEditor__icon ProfileEditor__icon--bio" />
             )
           }
-          label={fullBio.aboutText || i18n('ProfileEditor--about')}
+          label={
+            <Emojify text={fullBio.aboutText || i18n('ProfileEditor--about')} />
+          }
           onClick={() => {
             setEditState(EditState.Bio);
           }}