diff --git a/src/js/component.js b/src/js/component.js
index b1460dd22..4ca4de70c 100644
--- a/src/js/component.js
+++ b/src/js/component.js
@@ -868,7 +868,9 @@ vjs.Component.prototype.emitTapEvents = function(){
 
   // When the touch ends, measure how long it took and trigger the appropriate
   // event
-  this.on('touchend', function() {
+  this.on('touchend', function(event) {
+    event.stopImmediatePropagation();
+
     // Proceed only if the touchmove/leave/cancel event didn't happen
     if (couldBeTap === true) {
       // Measure how long the touch lasted
diff --git a/src/js/media/media.js b/src/js/media/media.js
index 8910a21d6..a51d3b637 100644
--- a/src/js/media/media.js
+++ b/src/js/media/media.js
@@ -134,7 +134,10 @@ vjs.MediaTechController.prototype.onClick = function(event){
  */
 
 vjs.MediaTechController.prototype.onTap = function(){
-  this.player().userActive(!this.player().userActive());
+  var userActivity = this.player().userActive();
+  if (userActivity) {
+    this.player().userActive(!userActivity);
+  }
 };
 
 vjs.MediaTechController.prototype.features = {