diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx
index 44630a318c..c680d75d1b 100644
--- a/web/react/components/user_settings/custom_theme_chooser.jsx
+++ b/web/react/components/user_settings/custom_theme_chooser.jsx
@@ -53,9 +53,12 @@ export default class CustomThemeChooser extends React.Component {
 
         const elements = [];
         let colors = '';
-        Constants.THEME_ELEMENTS.forEach((element) => {
+        Constants.THEME_ELEMENTS.forEach((element, index) => {
             elements.push(
-                <div className='col-sm-4 form-group'>
+                <div
+                    className='col-sm-4 form-group'
+                    key={'custom-theme-key' + index}
+                >
                     <label className='custom-label'>{element.uiName}</label>
                     <div
                         className='input-group color-picker'
diff --git a/web/react/components/user_settings/premade_theme_chooser.jsx b/web/react/components/user_settings/premade_theme_chooser.jsx
index e6aa2f5b9a..f8f916bd00 100644
--- a/web/react/components/user_settings/premade_theme_chooser.jsx
+++ b/web/react/components/user_settings/premade_theme_chooser.jsx
@@ -23,7 +23,10 @@ export default class PremadeThemeChooser extends React.Component {
                 }
 
                 premadeThemes.push(
-                    <div className='col-sm-3 premade-themes'>
+                    <div
+                        className='col-sm-3 premade-themes'
+                        key={'premade-theme-key' + k}
+                    >
                         <div
                             className={activeClass}
                             onClick={() => this.props.updateTheme(premadeTheme)}