diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index b137ea39f..25e6b4389 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.2.11",
-  "_release": "1.2.11",
+  "version": "1.2.12",
+  "_release": "1.2.12",
   "_resolution": {
     "type": "version",
-    "tag": "1.2.11",
-    "commit": "46578959a8407ba9db7d2ae9b27dfa30a5abe6b3"
+    "tag": "1.2.12",
+    "commit": "7f5e97c93b067629c7e3d0da3599ec812ad573b4"
   },
   "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "^1.2.0",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/focusmanager.js b/dashboard-ui/bower_components/emby-webcomponents/focusmanager.js
index 01acfa6a6..1ad3542e3 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/focusmanager.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/focusmanager.js
@@ -58,7 +58,8 @@ define([], function () {
         return elem;
     }
 
-    function isFocusableElementValid(elem) {
+    // Determines if a focusable element can be focused at a given point in time 
+    function isCurrentlyFocusable(elem) {
 
         if (elem.disabled) {
             return false;
@@ -84,7 +85,7 @@ define([], function () {
 
             var elem = elems[i];
 
-            if (isFocusableElementValid(elem)) {
+            if (isCurrentlyFocusable(elem)) {
                 focusableElements.push(elem);
             }
         }
@@ -203,7 +204,7 @@ define([], function () {
                 continue;
             }
 
-            if (!isFocusableElementValid(curr)) {
+            if (!isCurrentlyFocusable(curr)) {
                 continue;
             }
 
@@ -480,6 +481,7 @@ define([], function () {
         moveDown: function (sourceElement) {
             nav(sourceElement, 3);
         },
-        sendText: sendText
+        sendText: sendText,
+        isCurrentlyFocusable: isCurrentlyFocusable
     };
 });
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/emby-webcomponents/viewmanager.js b/dashboard-ui/bower_components/emby-webcomponents/viewmanager.js
index 009081fbb..cc3b7189a 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/viewmanager.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/viewmanager.js
@@ -51,8 +51,12 @@ define(['viewcontainer', 'focusManager', 'queryString', 'connectionManager', 'ev
                 focusManager.autoFocus(view);
             }
         }
-        else if (view.activeElement) {
-            view.activeElement.focus();
+        else {
+            if (view.activeElement && document.body.contains(view.activeElement) && focusManager.isCurrentlyFocusable(view.activeElement)) {
+                focusManager.focus(view.activeElement);
+            } else {
+                focusManager.autoFocus(view);
+            }
         }
 
         view.dispatchEvent(new CustomEvent('viewshow', eventDetail));
diff --git a/dashboard-ui/bower_components/paper-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json
index 2b04bf9f8..a6b333d33 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 157225ee7..2f654d71c 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