diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx
index 1e724bb6ef..143eadccbc 100644
--- a/web/react/components/user_settings/custom_theme_chooser.jsx
+++ b/web/react/components/user_settings/custom_theme_chooser.jsx
@@ -253,6 +253,9 @@ class CustomThemeChooser extends React.Component {
                         </div>
                     </div>
                 );
+
+                colors += theme[element.id] + ',';
+
             } else if (element.group === 'sidebarElements') {
                 sidebarElements.push(
                     <div
@@ -303,6 +306,7 @@ class CustomThemeChooser extends React.Component {
         });
 
         colors += theme.codeTheme;
+        console.log(colors);
 
         const pasteBox = (
             <div className='col-sm-12'>
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index daea9f43e7..4b1f73b794 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -370,21 +370,6 @@ export default {
             id: 'newMessageSeparator',
             uiName: 'New Message Separator'
         },
-        {
-            group: 'linkAndButtonElements',
-            id: 'linkColor',
-            uiName: 'Link Color'
-        },
-        {
-            group: 'linkAndButtonElements',
-            id: 'buttonBg',
-            uiName: 'Button BG'
-        },
-        {
-            group: 'linkAndButtonElements',
-            id: 'buttonColor',
-            uiName: 'Button Text'
-        },
         {
             group: 'centerChannelElements',
             id: 'mentionHighlightBg',
@@ -417,6 +402,21 @@ export default {
                     uiName: 'Monokai'
                 }
             ]
+        },
+        {
+            group: 'linkAndButtonElements',
+            id: 'linkColor',
+            uiName: 'Link Color'
+        },
+        {
+            group: 'linkAndButtonElements',
+            id: 'buttonBg',
+            uiName: 'Button BG'
+        },
+        {
+            group: 'linkAndButtonElements',
+            id: 'buttonColor',
+            uiName: 'Button Text'
         }
     ],
     DEFAULT_CODE_THEME: 'github',