Merge branch 'master' into flyswatter-patch-1

2 files changed, 9 insertions, 6 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2990be3d2..d552e6ab8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 ## 3.6.1 2017-4-30
 
+- Made fox less nosy.
+
+
 - Fix bug where error was reported in debugger console when Chrome opened a new window.
 - Fix bug where block-tracker could stop polling for new blocks.
 
diff --git a/ui/app/unlock.js b/ui/app/unlock.js
index 1aee3c5d0..5014744f5 100644
--- a/ui/app/unlock.js
+++ b/ui/app/unlock.js
@@ -109,10 +109,10 @@ UnlockScreen.prototype.submitPassword = function (event) {
 UnlockScreen.prototype.inputChanged = function (event) {
   // tell mascot to look at page action
   var element = event.target
-  var boundingRect = element.getBoundingClientRect()
-  var coordinates = getCaretCoordinates(element, element.selectionEnd)
-  this.animationEventEmitter.emit('point', {
-    x: boundingRect.left + coordinates.left - element.scrollLeft,
-    y: boundingRect.top + coordinates.top - element.scrollTop,
-  })
+  var viewRect = element.getBoundingClientRect()
+  var carat = getCaretCoordinates(element, element.selectionEnd)
+  var x = viewRect.right - carat.left + element.scrollLeft
+  var y = 100
+  var pointAt = { x, y }
+  this.animationEventEmitter.emit('point', pointAt)
 }