Merge remote-tracking branch 'origin/MAGETWO-58771' into 2.0-develop-pr6

Author: zakdma

lib/web/mage/edit-trigger.js

@@ -98,12 +98,16 @@
          * @protected
          */
         _onMouseMove: function(e) {
-            var target = $(e.target);
-            target = target.is(this.trigger) || target.is(this.options.editSelector) ?
-                target :
-                target.parents(this.options.editSelector).first();
+            var target = $(e.target),
+                inner = target.find(this.options.editSelector);
 
-            if (target.size()) {
+            if ($(e.target).is('button') && inner.length) {
+                target = inner;
+            } else if (!target.is(this.trigger) && !target.is(this.options.editSelector)) {
+                target = target.parents(this.options.editSelector).first();
+            }
+
+            if (target.length) {
                 if (!target.is(this.trigger)) {
                     this._setPosition(target);
                     this.currentTarget = target;