diff --git a/webapp/components/edit_post_modal.jsx b/webapp/components/edit_post_modal.jsx
index 40029064fa..c2ffb2ed7f 100644
--- a/webapp/components/edit_post_modal.jsx
+++ b/webapp/components/edit_post_modal.jsx
@@ -222,7 +222,7 @@ export default class EditPostModal extends React.Component {
                         <div className='edit-modal-body modal-body'>
                             <Textbox
                                 onInput={this.handleInput}
-                                onKeyPress={this.handleEditKeyPress}
+                                onKeyDown={this.handleEditKeyPress}
                                 messageText={this.state.editText}
                                 createMessage={Utils.localizeMessage('edit_post.editPost', 'Edit the post...')}
                                 supportsCommands={false}
diff --git a/webapp/components/textbox.jsx b/webapp/components/textbox.jsx
index fac1bd0270..791513b88e 100644
--- a/webapp/components/textbox.jsx
+++ b/webapp/components/textbox.jsx
@@ -26,7 +26,6 @@ export default class Textbox extends React.Component {
         this.focus = this.focus.bind(this);
         this.getStateFromStores = this.getStateFromStores.bind(this);
         this.onRecievedError = this.onRecievedError.bind(this);
-        this.handleKeyPress = this.handleKeyPress.bind(this);
         this.handleKeyDown = this.handleKeyDown.bind(this);
         this.handleHeightChange = this.handleHeightChange.bind(this);
         this.showPreview = this.showPreview.bind(this);
@@ -69,14 +68,8 @@ export default class Textbox extends React.Component {
         }
     }
 
-    handleKeyPress(e) {
-        this.props.onKeyPress(e);
-    }
-
     handleKeyDown(e) {
-        if (this.props.onKeyDown) {
-            this.props.onKeyDown(e);
-        }
+        this.props.onKeyDown(e);
     }
 
     handleHeightChange(height) {
@@ -190,7 +183,6 @@ export default class Textbox extends React.Component {
                     maxLength={Constants.MAX_POST_LEN}
                     placeholder={this.props.createMessage}
                     onInput={this.props.onInput}
-                    onKeyPress={this.handleKeyPress}
                     onKeyDown={this.handleKeyDown}
                     onHeightChange={this.handleHeightChange}
                     style={{visibility: this.state.preview ? 'hidden' : 'visible'}}
@@ -235,8 +227,7 @@ Textbox.propTypes = {
     channelId: React.PropTypes.string,
     messageText: React.PropTypes.string.isRequired,
     onInput: React.PropTypes.func.isRequired,
-    onKeyPress: React.PropTypes.func.isRequired,
     createMessage: React.PropTypes.string.isRequired,
-    onKeyDown: React.PropTypes.func,
+    onKeyDown: React.PropTypes.func.isRequired,
     supportsCommands: React.PropTypes.bool.isRequired
 };