diff --git a/app/components/autocomplete/slash_suggestion/index.js b/app/components/autocomplete/slash_suggestion/index.js
index a05e54526..ad25bcf65 100644
--- a/app/components/autocomplete/slash_suggestion/index.js
+++ b/app/components/autocomplete/slash_suggestion/index.js
@@ -14,7 +14,7 @@ import {isLandscape} from 'app/selectors/device';
 import SlashSuggestion from './slash_suggestion';
 
 // TODO: Remove when all below commands have been implemented
-const COMMANDS_TO_IMPLEMENT_LATER = ['collapse', 'expand', 'join', 'open', 'leave', 'logout', 'msg', 'grpmsg'];
+const COMMANDS_TO_IMPLEMENT_LATER = ['collapse', 'expand', 'join', 'open', 'logout', 'msg', 'grpmsg'];
 const NON_MOBILE_COMMANDS = ['rename', 'invite_people', 'shortcuts', 'search', 'help', 'settings', 'remove'];
 
 const COMMANDS_TO_HIDE_ON_MOBILE = [...COMMANDS_TO_IMPLEMENT_LATER, ...NON_MOBILE_COMMANDS];
diff --git a/app/screens/channel/channel.android.js b/app/screens/channel/channel.android.js
index 6b492eb1c..f458b9763 100644
--- a/app/screens/channel/channel.android.js
+++ b/app/screens/channel/channel.android.js
@@ -51,6 +51,7 @@ export default class ChannelAndroid extends ChannelBase {
                     <PostDraft
                         ref={this.postDraft}
                         screenId={this.props.componentId}
+                        key={this.props.currentChannelId}
                     />
                 </KeyboardLayout>
                 <NetworkIndicator/>