2 files changed, 6 insertions, 9 deletions

diff --git a/web/react/components/user_settings/manage_outgoing_hooks.jsx b/web/react/components/user_settings/manage_outgoing_hooks.jsx
index d8272610d..e83ae3bd6 100644
--- a/web/react/components/user_settings/manage_outgoing_hooks.jsx
+++ b/web/react/components/user_settings/manage_outgoing_hooks.jsx
@@ -39,12 +39,12 @@ export default class ManageOutgoingHooks extends React.Component {
         Client.addOutgoingHook(
             hook,
             (data) => {
-                let hooks = this.state.hooks;
+                let hooks = Object.assign([], this.state.hooks);
                 if (!hooks) {
                     hooks = [];
                 }
                 hooks.push(data);
-                this.setState({hooks, serverError: null});
+                this.setState({hooks, serverError: null, channelId: '', triggerWords: '', callbackURLs: ''});
             },
             (err) => {
                 this.setState({serverError: err});
@@ -93,7 +93,7 @@ export default class ManageOutgoingHooks extends React.Component {
                     }
                 }
 
-                this.setState({hooks});
+                this.setState({hooks, serverError: null});
             },
             (err) => {
                 this.setState({serverError: err});
@@ -103,14 +103,9 @@ export default class ManageOutgoingHooks extends React.Component {
     getHooks() {
         Client.listOutgoingHooks(
             (data) => {
-                const state = this.state;
-
                 if (data) {
-                    state.hooks = data;
+                    this.setState({hooks: data, getHooksComplete: true, serverError: null});
                 }
-
-                state.getHooksComplete = true;
-                this.setState(state);
             },
             (err) => {
                 this.setState({serverError: err});
diff --git a/web/react/components/user_settings/user_settings_integrations.jsx b/web/react/components/user_settings/user_settings_integrations.jsx
index 5711b8de2..bc5f36a51 100644
--- a/web/react/components/user_settings/user_settings_integrations.jsx
+++ b/web/react/components/user_settings/user_settings_integrations.jsx
@@ -20,6 +20,8 @@ export default class UserSettingsIntegrationsTab extends React.Component {
     }
     handleClose() {
         this.updateSection('');
+        $('.ps-container.modal-body').scrollTop(0);
+        $('.ps-container.modal-body').perfectScrollbar('update');
     }
     componentDidMount() {
         $('#user_settings').on('hidden.bs.modal', this.handleClose);