diff --git a/.gitignore b/.gitignore
index ac62bd07a1..4895d21b80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,9 +71,6 @@ coverage
 # Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 
-# Bower dependency directory (https://bower.io/)
-bower_components
-
 # node-waf configuration
 .lock-wscript
 
diff --git a/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.js b/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.js
index 331b178b39..481155d3b7 100644
--- a/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.js
+++ b/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.js
@@ -191,9 +191,9 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
                 currentPlayer.setVolume(this.value);
             }
         }
-        volumeSlider.addEventListener('change', setVolume.bind(this));
-        volumeSlider.addEventListener('mousemove', setVolume.bind(this));
-        volumeSlider.addEventListener('touchmove', setVolume.bind(this));
+        volumeSlider.addEventListener('change', setVolume);
+        volumeSlider.addEventListener('mousemove', setVolume);
+        volumeSlider.addEventListener('touchmove', setVolume);
 
 
         positionSlider = elem.querySelector('.nowPlayingBarPositionSlider');
diff --git a/src/components/remotecontrol.js b/src/components/remotecontrol.js
index 58e69961e7..76f0d673d0 100644
--- a/src/components/remotecontrol.js
+++ b/src/components/remotecontrol.js
@@ -429,6 +429,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
             if (!state.NextMediaType) {
                 updatePlayerState(player, dlg, {});
                 loadPlaylist(dlg);
+                Emby.Page.back();
             }
         }