1 files changed, 7 insertions, 3 deletions

diff --git a/webapp/components/backstage/add_command.jsx b/webapp/components/backstage/add_command.jsx
index 2eb7bdb21..ba9ac4e79 100644
--- a/webapp/components/backstage/add_command.jsx
+++ b/webapp/components/backstage/add_command.jsx
@@ -89,6 +89,8 @@ export default class AddCommand extends React.Component {
                     />
                 )
             });
+
+            return;
         }
 
         if (!command.url) {
@@ -101,12 +103,14 @@ export default class AddCommand extends React.Component {
                     />
                 )
             });
+
+            return;
         }
 
         AsyncClient.addCommand(
             command,
             () => {
-                browserHistory.push('/settings/integrations/commands');
+                browserHistory.push('/' + Utils.getTeamNameFromUrl() + '/settings/integrations/commands');
             },
             (err) => {
                 this.setState({
@@ -251,7 +255,7 @@ export default class AddCommand extends React.Component {
         return (
             <div className='backstage-content row'>
                 <BackstageHeader>
-                    <Link to={'/settings/integrations/commands'}>
+                    <Link to={'/' + Utils.getTeamNameFromUrl() + '/settings/integrations/commands'}>
                         <FormattedMessage
                             id='installed_command.header'
                             defaultMessage='Slash Commands'
@@ -482,7 +486,7 @@ export default class AddCommand extends React.Component {
                             <FormError errors={[this.state.serverError, this.state.clientError]}/>
                             <Link
                                 className='btn btn-sm'
-                                to={'/settings/integrations/commands'}
+                                to={'/' + Utils.getTeamNameFromUrl() + '/settings/integrations/commands'}
                             >
                                 <FormattedMessage
                                     id='add_command.cancel'