diff --git a/source/components/conversation/Input.js b/source/components/conversation/Input.js
index 6e6a77b94..50821e296 100644
--- a/source/components/conversation/Input.js
+++ b/source/components/conversation/Input.js
@@ -40,9 +40,6 @@ export default class Input extends Component {
 								? { border: '2px dashed #ddd' }
 								: { border: `1px solid ${themeColours.textColourOnWhite}` }
 						}
-						onKeyDown={({ key }) =>
-							key == 'Enter' && (submitDisabled ? input.onBlur() : submit())
-						}
 					/>
 					{suffixed && (
 						<label
diff --git a/source/components/conversation/SendButton.js b/source/components/conversation/SendButton.js
index f198e074d..90e1ee262 100644
--- a/source/components/conversation/SendButton.js
+++ b/source/components/conversation/SendButton.js
@@ -7,6 +7,19 @@ export default class SendButton extends Component {
 		let { disabled, submit } = this.props
 		return () => (!disabled ? submit() : null)
 	}
+	componentDidMount() {
+		// removeEventListener will need the exact same function instance
+		this.boundHandleKeyDown = this.handleKeyDown.bind(this)
+
+		window.addEventListener('keydown', this.boundHandleKeyDown)
+	}
+	componentWillUnmount() {
+		window.removeEventListener('keydown', this.boundHandleKeyDown)
+	}
+	handleKeyDown({ key }) {
+		if (key !== 'Enter') return
+		this.getAction()()
+	}
 	render() {
 		let { disabled, themeColours, hover } = this.props
 		return (