4 files changed, 25 insertions, 23 deletions

diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx
index c8c0c071e..d4eb60676 100644
--- a/web/react/components/textbox.jsx
+++ b/web/react/components/textbox.jsx
@@ -61,7 +61,7 @@ export default class Textbox extends React.Component {
     onRecievedError() {
         const errorCount = ErrorStore.getConnectionErrorCount();
 
-        if (errorCount > 0) {
+        if (errorCount > 1) {
             this.setState({connection: 'bad-connection'});
         } else {
             this.setState({connection: ''});
diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx
index 1e724bb6e..4ee9fd0e2 100644
--- a/web/react/components/user_settings/custom_theme_chooser.jsx
+++ b/web/react/components/user_settings/custom_theme_chooser.jsx
@@ -253,6 +253,8 @@ class CustomThemeChooser extends React.Component {
                         </div>
                     </div>
                 );
+
+                colors += theme[element.id] + ',';
             } else if (element.group === 'sidebarElements') {
                 sidebarElements.push(
                     <div
diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx
index 9b2b049b7..ec25255d9 100644
--- a/web/react/stores/socket_store.jsx
+++ b/web/react/stores/socket_store.jsx
@@ -31,6 +31,7 @@ class SocketStoreClass extends EventEmitter {
         this.close = this.close.bind(this);
 
         this.failCount = 0;
+        this.isInitialize = false;
 
         this.translations = this.getDefaultTranslations();
 
@@ -58,24 +59,23 @@ class SocketStoreClass extends EventEmitter {
 
             if (this.failCount === 0) {
                 console.log('websocket connecting to ' + connUrl); //eslint-disable-line no-console
-                if (ErrorStore.getConnectionErrorCount() > 0) {
-                    ErrorStore.setConnectionErrorCount(0);
-                    ErrorStore.emitChange();
-                }
             }
+
             conn = new WebSocket(connUrl);
 
             conn.onopen = () => {
                 if (this.failCount > 0) {
                     console.log('websocket re-established connection'); //eslint-disable-line no-console
+                    AsyncClient.getChannels();
+                    AsyncClient.getPosts(ChannelStore.getCurrentId());
+                }
 
+                if (this.isInitialize) {
                     ErrorStore.clearLastError();
                     ErrorStore.emitChange();
-
-                    AsyncClient.getChannels();
-                    AsyncClient.getPosts(ChannelStore.getCurrentId());
                 }
 
+                this.isInitialize = true;
                 this.failCount = 0;
             };
 
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index daea9f43e..4b1f73b79 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -371,21 +371,6 @@ export default {
             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',
             uiName: 'Mention Highlight BG'
@@ -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',