1 files changed, 3 insertions, 3 deletions

diff --git a/webapp/components/edit_channel_header_modal.jsx b/webapp/components/edit_channel_header_modal.jsx
index ef1f68b70..b993fb93c 100644
--- a/webapp/components/edit_channel_header_modal.jsx
+++ b/webapp/components/edit_channel_header_modal.jsx
@@ -85,15 +85,14 @@ class EditChannelHeaderModal extends React.Component {
             this.props.channel.id,
             this.state.header,
             () => {
-                this.setState({serverError: ''});
+                this.setState({serverError: '', submitted: false});
                 this.onHide();
             },
             (err) => {
                 if (err.id === 'api.context.invalid_param.app_error') {
                     this.setState({serverError: this.props.intl.formatMessage(holders.error)});
-                } else {
-                    this.setState({serverError: err.message});
                 }
+                this.setState({submitted: false});
             }
         );
     }
@@ -189,6 +188,7 @@ class EditChannelHeaderModal extends React.Component {
                             handlePostError={this.handlePostError}
                             id='edit_textbox'
                             ref='editChannelHeaderTextbox'
+                            characterLimit={1024}
                         />
                         <br/>
                         {serverError}