Merge branch 'fix-dom-selection-in-account-input'

2 files changed, 3 insertions, 2 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index afc660c4e0..d54b3718e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Increase a timeout for problem report collection to fix a timeout error on slower machines.
 - Fix a memory leak in the problem report collection routine.
 - Fix an issue when viewing a problem report brought up a dialog to choose the application to open the file.
+- Fix a bug in account input field that advanced the cursor to the end regardless its prior position.
 
 ## [2018.1-beta10] - 2018-02-13
 ### Added
diff --git a/app/components/AccountInput.js b/app/components/AccountInput.js
index 21967d856a..418cb3b77e 100644
--- a/app/components/AccountInput.js
+++ b/app/components/AccountInput.js
@@ -85,7 +85,7 @@ export default class AccountInput extends React.Component<AccountInputProps, Acc
         onKeyDown={ this.onKeyDown }
         onPaste={ this.onPaste }
         onCut={ this.onCut }
-        ref={ this.onRef } />
+        ref={ (ref) => this.onRef(ref) } />
     );
   }
 
@@ -295,7 +295,7 @@ export default class AccountInput extends React.Component<AccountInputProps, Acc
     }
   }
 
-  onRef = (ref: ?HTMLInputElement) => {
+  onRef(ref: ?HTMLInputElement) {
     this._ref = ref;
     if(!ref) { return; }