diff --git a/extension/keysocket-plex.js b/extension/keysocket-plex.js
index 39acd43..9b103d5 100644
--- a/extension/keysocket-plex.js
+++ b/extension/keysocket-plex.js
@@ -1,26 +1,18 @@
 function onKeyPress(key) {
     if (key === NEXT) {
-        var nextButton = document.querySelector('button.next-btn');
+        var nextButton = document.querySelector('button[aria-label="Next"]');
         simulateClick(nextButton);
     } else if (key === PLAY) {
-        var playButton = document.querySelector('button.play-btn'),
+        var playButton = document.querySelector('button[aria-label="Play"]'),
             pauseButton;
-        try {
-            if (playButton.classList.contains('hidden')) {
-                pauseButton = document.querySelector('button.pause-btn');
-                simulateClick(pauseButton);
-            } else {
-                simulateClick(playButton);
-            }
-        } catch (e) {
-            var playAllButton = document.querySelector('a.play-btn');
-            simulateClick(playAllButton);
+        if (playButton === null) {
+            pauseButton = document.querySelector('button[aria-label="Pause"]');
+            simulateClick(pauseButton);
+        } else {
+            simulateClick(playButton);
         }
     } else if (key === PREV) {
-        var backButton = document.querySelector('button.previous-btn');
+        var backButton = document.querySelector('button[aria-label="Previous"]');
         simulateClick(backButton);
-    } else if (key === STOP) {
-        var stopButton = document.querySelector('button.stop-btn');
-        simulateClick(stopButton);
     }
 }
diff --git a/extension/manifest.json b/extension/manifest.json
index 2aeb454..6051310 100644
--- a/extension/manifest.json
+++ b/extension/manifest.json
@@ -189,7 +189,7 @@
       "js": ["shared.js", "keysocket-picartotv.js"]
     },
     {
-      "matches": ["*://plex.tv/web/*", "*://app.plex.tv/web/*"],
+      "matches": ["*://plex.tv/web/*", "*://app.plex.tv/*"],
       "js": ["shared.js", "keysocket-plex.js"]
     },
     {