diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx
index ad225e120b..b817cb57d5 100644
--- a/webapp/components/channel_header.jsx
+++ b/webapp/components/channel_header.jsx
@@ -425,11 +425,11 @@ export default class ChannelHeader extends React.Component {
         if (isDirect) {
             dropdownContents.push(
                 <li
-                    id='channelEditHeaderDirect'
                     key='edit_header_direct'
                     role='presentation'
                 >
                     <ToggleModalButton
+                        id='channelEditHeaderDirect'
                         role='menuitem'
                         dialogType={EditChannelHeaderModal}
                         dialogProps={{channel}}
@@ -444,11 +444,11 @@ export default class ChannelHeader extends React.Component {
         } else if (isGroup) {
             dropdownContents.push(
                 <li
-                    id='channelEditHeaderGroup'
                     key='edit_header_direct'
                     role='presentation'
                 >
                     <ToggleModalButton
+                        id='channelEditHeaderGroup'
                         role='menuitem'
                         dialogType={EditChannelHeaderModal}
                         dialogProps={{channel}}
@@ -463,11 +463,11 @@ export default class ChannelHeader extends React.Component {
 
             dropdownContents.push(
                 <li
-                    id='channelnotificationPreferencesGroup'
                     key='notification_preferences'
                     role='presentation'
                 >
                     <ToggleModalButton
+                        id='channelnotificationPreferencesGroup'
                         role='menuitem'
                         dialogType={ChannelNotificationsModal}
                         dialogProps={{
@@ -486,11 +486,11 @@ export default class ChannelHeader extends React.Component {
 
             dropdownContents.push(
                 <li
-                    id='channelAddMembersGroup'
                     key='add_members'
                     role='presentation'
                 >
                     <a
+                        id='channelAddMembersGroup'
                         role='menuitem'
                         href='#'
                         onClick={this.openDirectMessageModal}
@@ -505,11 +505,11 @@ export default class ChannelHeader extends React.Component {
         } else {
             dropdownContents.push(
                 <li
-                    id='channelViewInfo'
                     key='view_info'
                     role='presentation'
                 >
                     <ToggleModalButton
+                        id='channelViewInfo'
                         role='menuitem'
                         dialogType={ChannelInfoModal}
                         dialogProps={{channel}}
@@ -525,11 +525,11 @@ export default class ChannelHeader extends React.Component {
             if (ChannelStore.isDefault(channel)) {
                 dropdownContents.push(
                     <li
-                        id='channelManageMembers'
                         key='manage_members'
                         role='presentation'
                     >
                         <a
+                            id='channelManageMembers'
                             role='menuitem'
                             href='#'
                             onClick={() => this.setState({showMembersModal: true})}
@@ -545,11 +545,11 @@ export default class ChannelHeader extends React.Component {
 
             dropdownContents.push(
                 <li
-                    id='channelNotificationPreferences'
                     key='notification_preferences'
                     role='presentation'
                 >
                     <ToggleModalButton
+                        id='channelNotificationPreferences'
                         role='menuitem'
                         dialogType={ChannelNotificationsModal}
                         dialogProps={{
@@ -577,11 +577,11 @@ export default class ChannelHeader extends React.Component {
                 if (ChannelUtils.canManageMembers(channel, isSystemAdmin, isTeamAdmin, isChannelAdmin)) {
                     dropdownContents.push(
                         <li
-                            id='channelAddMembers'
                             key='add_members'
                             role='presentation'
                         >
                             <ToggleModalButton
+                                id='channelAddMembers'
                                 ref='channelInviteModalButton'
                                 role='menuitem'
                                 dialogType={ChannelInviteModal}
@@ -597,11 +597,11 @@ export default class ChannelHeader extends React.Component {
 
                     dropdownContents.push(
                         <li
-                            id='channelManageMembers'
                             key='manage_members'
                             role='presentation'
                         >
                             <a
+                                id='channelManageMembers'
                                 role='menuitem'
                                 href='#'
                                 onClick={() => this.setState({showMembersModal: true})}
@@ -616,11 +616,11 @@ export default class ChannelHeader extends React.Component {
                 } else {
                     dropdownContents.push(
                         <li
-                            id='channelViewMembers'
                             key='view_members'
                             role='presentation'
                         >
                             <a
+                                id='channelViewMembers'
                                 role='menuitem'
                                 href='#'
                                 onClick={() => this.setState({showMembersModal: true})}
@@ -637,11 +637,11 @@ export default class ChannelHeader extends React.Component {
 
             const deleteOption = (
                 <li
-                    id='channelDelete'
                     key='delete_channel'
                     role='presentation'
                 >
                     <ToggleModalButton
+                        id='channelDelete'
                         role='menuitem'
                         dialogType={DeleteChannelModal}
                         dialogProps={{channel}}
@@ -664,11 +664,11 @@ export default class ChannelHeader extends React.Component {
 
                 dropdownContents.push(
                     <li
-                        id='channelEditHeader'
                         key='set_channel_header'
                         role='presentation'
                     >
                         <ToggleModalButton
+                            id='channelEditHeader'
                             role='menuitem'
                             dialogType={EditChannelHeaderModal}
                             dialogProps={{channel}}
@@ -683,11 +683,11 @@ export default class ChannelHeader extends React.Component {
 
                 dropdownContents.push(
                     <li
-                        id='channelEditPurpose'
                         key='set_channel_purpose'
                         role='presentation'
                     >
                         <a
+                            id='channelEditPurpose'
                             role='menuitem'
                             href='#'
                             onClick={() => this.setState({showEditChannelPurposeModal: true})}
@@ -702,11 +702,11 @@ export default class ChannelHeader extends React.Component {
 
                 dropdownContents.push(
                     <li
-                        id='channelRename'
                         key='rename_channel'
                         role='presentation'
                     >
                         <a
+                            id='channelRename'
                             role='menuitem'
                             href='#'
                             onClick={this.showRenameChannelModal}
@@ -739,11 +739,11 @@ export default class ChannelHeader extends React.Component {
 
                 dropdownContents.push(
                     <li
-                        id='channelLeave'
                         key='leave_channel'
                         role='presentation'
                     >
                         <a
+                            id='channelLeave'
                             role='menuitem'
                             href='#'
                             onClick={this.handleLeave}