diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 9f28d86c7..7a5762e2a 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -252,6 +252,10 @@
             window.Whisper.events.trigger('inviteFriends', this.model);
           },
 
+          onUpdateGroupName: () => {
+            window.Whisper.events.trigger('updateGroupName', this.model);
+          },
+
           onAddModerators: () => {
             window.Whisper.events.trigger('addModerators', this.model);
           },
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 5f90e7920..7120b5a19 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -92,6 +92,7 @@ interface Props {
   onRemoveModerators: () => void;
   onInviteFriends: () => void;
   onAvatarClick?: (userPubKey: string) => void;
+  onUpdateGroupName: () => void;
 
   i18n: LocalizerType;
 }
@@ -292,6 +293,7 @@ export class ConversationHeader extends React.Component<Props> {
       onAddModerators,
       onRemoveModerators,
       onInviteFriends,
+      onUpdateGroupName,
     } = this.props;
 
     const isPrivateGroup = isGroup && !isPublic && !isRss;
@@ -313,6 +315,9 @@ export class ConversationHeader extends React.Component<Props> {
             {i18n('removeModerators')}
           </MenuItem>
         ) : null}
+        {amMod ? (
+          <MenuItem onClick={onUpdateGroupName}>{i18n('editGroupNameOrPicture')}</MenuItem>
+        ) : null}
         {isPrivateGroup ? (
           <MenuItem onClick={onLeaveGroup}>{i18n('leaveGroup')}</MenuItem>
         ) : null}