diff --git a/source/components/CurrencyInput/CurrencyInput.js b/source/components/CurrencyInput/CurrencyInput.js
index 521e0e01d..f9fd66eb3 100644
--- a/source/components/CurrencyInput/CurrencyInput.js
+++ b/source/components/CurrencyInput/CurrencyInput.js
@@ -47,9 +47,6 @@ class CurrencyInput extends Component {
 		this.input.current.selectionEnd = cursorPosition
 		this.adaptInputSize()
 	}
-	focusInput = () => {
-		this.input.current.focus()
-	}
 	handleChange = event => {
 		let value = event.target.value
 		value = value
@@ -77,7 +74,6 @@ class CurrencyInput extends Component {
 
 		return (
 			<div
-				onClick={this.focusInput}
 				className={classnames(
 					this.props.className,
 					'currencyInput__container'
diff --git a/source/components/TargetSelection.js b/source/components/TargetSelection.js
index d834bc3fa..eaee75f1a 100644
--- a/source/components/TargetSelection.js
+++ b/source/components/TargetSelection.js
@@ -250,7 +250,6 @@ let CurrencyField = withColours(props => {
 			}}
 			debounce={600}
 			className="targetInput"
-			key={props.input.value}
 			defaultValue={props.input.value}
 			{...props.input}
 			{...props}