diff --git a/ts/components/AvatarPopup.stories.tsx b/ts/components/AvatarPopup.stories.tsx
index 5b032081d9..15f0100c02 100644
--- a/ts/components/AvatarPopup.stories.tsx
+++ b/ts/components/AvatarPopup.stories.tsx
@@ -45,12 +45,12 @@ const useProps = (overrideProps: Partial<Props> = {}): Props => ({
   isMe: true,
   noteToSelf: boolean('noteToSelf', overrideProps.noteToSelf || false),
   onEditProfile: action('onEditProfile'),
+  onStartUpdate: action('startUpdate'),
   onViewArchive: action('onViewArchive'),
   onViewPreferences: action('onViewPreferences'),
   phoneNumber: text('phoneNumber', overrideProps.phoneNumber || ''),
   profileName: text('profileName', overrideProps.profileName || ''),
   sharedGroupNames: [],
-  startUpdate: action('startUpdate'),
   style: {},
   theme: React.useContext(StorybookThemeContext),
   title: text('title', overrideProps.title || ''),
diff --git a/ts/components/AvatarPopup.tsx b/ts/components/AvatarPopup.tsx
index f4706d9651..fbd8c0dab5 100644
--- a/ts/components/AvatarPopup.tsx
+++ b/ts/components/AvatarPopup.tsx
@@ -16,9 +16,9 @@ export type Props = {
   readonly theme: ThemeType;
 
   hasPendingUpdate: boolean;
-  startUpdate: () => unknown;
 
   onEditProfile: () => unknown;
+  onStartUpdate: () => unknown;
   onViewPreferences: () => unknown;
   onViewArchive: () => unknown;
 
@@ -34,11 +34,11 @@ export function AvatarPopup(props: Props): JSX.Element {
     i18n,
     name,
     onEditProfile,
+    onStartUpdate,
     onViewArchive,
     onViewPreferences,
     phoneNumber,
     profileName,
-    startUpdate,
     style,
     title,
   } = props;
@@ -105,7 +105,7 @@ export function AvatarPopup(props: Props): JSX.Element {
         <button
           type="button"
           className="module-avatar-popup__item"
-          onClick={startUpdate}
+          onClick={onStartUpdate}
         >
           <div
             className={classNames(
diff --git a/ts/components/MainHeader.tsx b/ts/components/MainHeader.tsx
index d4566e6913..266d521a36 100644
--- a/ts/components/MainHeader.tsx
+++ b/ts/components/MainHeader.tsx
@@ -173,13 +173,16 @@ export function MainHeader({
               title={title}
               avatarPath={avatarPath}
               hasPendingUpdate={hasPendingUpdate}
-              startUpdate={startUpdate}
               // See the comment above about `sharedGroupNames`.
               sharedGroupNames={[]}
               onEditProfile={() => {
                 toggleProfileEditor();
                 setShowAvatarPopup(false);
               }}
+              onStartUpdate={() => {
+                startUpdate();
+                setShowAvatarPopup(false);
+              }}
               onViewPreferences={() => {
                 showSettings();
                 setShowAvatarPopup(false);