diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index 7edfa79cdb..29b9cdbee7 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@@ -16,12 +16,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.3.41",
-  "_release": "1.3.41",
+  "version": "1.3.42",
+  "_release": "1.3.42",
   "_resolution": {
     "type": "version",
-    "tag": "1.3.41",
-    "commit": "b99e1de0001cc6c56af28b79cf0561f1cb25743f"
+    "tag": "1.3.42",
+    "commit": "24e9e6db9a792ad0860bfe074b2b50fabfd00d85"
   },
   "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "^1.2.0",
diff --git a/dashboard-ui/bower_components/paper-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json
index a6b333d335..2b04bf9f8a 100644
--- a/dashboard-ui/bower_components/paper-behaviors/.bower.json
+++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json
@@ -45,7 +45,7 @@
     "tag": "v1.0.11",
     "commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5"
   },
-  "_source": "git://github.com/polymerelements/paper-behaviors.git",
+  "_source": "git://github.com/PolymerElements/paper-behaviors.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/paper-behaviors"
+  "_originalSource": "PolymerElements/paper-behaviors"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json
index 2f654d71c6..157225ee71 100644
--- a/dashboard-ui/bower_components/paper-ripple/.bower.json
+++ b/dashboard-ui/bower_components/paper-ripple/.bower.json
@@ -32,14 +32,14 @@
     "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
   },
   "ignore": [],
-  "homepage": "https://github.com/polymerelements/paper-ripple",
+  "homepage": "https://github.com/PolymerElements/paper-ripple",
   "_release": "1.0.5",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.5",
     "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
   },
-  "_source": "git://github.com/polymerelements/paper-ripple.git",
+  "_source": "git://github.com/PolymerElements/paper-ripple.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/paper-ripple"
+  "_originalSource": "PolymerElements/paper-ripple"
 }
\ No newline at end of file
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index b2425cfac6..d7e2362d0a 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -32,6 +32,10 @@
 
         var elem = button.querySelector('.pageTabButtonSelectionBar');
 
+        if (!elem) {
+            return;
+        }
+
         var keyframes = [
           { transform: 'translate3d(-100%, 0, 0)', offset: 0 },
           { transform: 'none', offset: 1 }];
diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js
index c209b65ce4..ecb3f442ea 100644
--- a/dashboard-ui/scripts/search.js
+++ b/dashboard-ui/scripts/search.js
@@ -1,4 +1,4 @@
-define(['libraryBrowser', 'scrollStyles'], function (libraryBrowser) {
+define(['libraryBrowser', 'events', 'scrollStyles'], function (libraryBrowser, events) {
 
     var searchHintTimeout;
 
@@ -231,8 +231,8 @@
     function bindSearchEvents() {
 
         require(['searchmenu'], function (searchmenu) {
-            Events.on(window.SearchMenu, 'closed', closeSearchResults);
-            Events.on(window.SearchMenu, 'change', function (e, value) {
+            events.on(window.SearchMenu, 'closed', closeSearchResults);
+            events.on(window.SearchMenu, 'change', function (e, value) {
 
                 onHeaderSearchChange(value);
             });
@@ -257,11 +257,14 @@
         });
     }
 
-    document.addEventListener('pagebeforehide', closeSearchResults);
+    document.addEventListener('viewbeforehide', closeSearchResults);
 
     document.addEventListener('headercreated', function () {
 
         bindSearchEvents();
     });
 
+    // dismiss search UI if user clicks a play button on a search result
+    events.on(MediaController, 'beforeplaybackstart', closeSearchResults);
+
 });
\ No newline at end of file