diff --git a/extension/script.js b/extension/script.js
index e2fc3d6..0c94463 100644
--- a/extension/script.js
+++ b/extension/script.js
@@ -106,7 +106,7 @@ function getBrowser() {
 }
 
 function getChannelContainers() {
-  const elements = document.querySelectorAll('#inner-header-container, #owner');
+  const elements = document.querySelectorAll('.yt-flexible-actions-view-model-wiz, #owner');
   const channelContainerNodes = [];
 
   elements.forEach(element => {
@@ -196,7 +196,9 @@ function getChannelHandle(channelContainer) {
   const videoOwnerRenderer = channelContainer.querySelector('.ytd-video-owner-renderer');
 
   if (!videoOwnerRenderer) {
-    const channelHandleContainer = document.querySelector('#channel-handle');
+    const channelHandleContainer = document.querySelector(
+      '.yt-content-metadata-view-model-wiz__metadata-text'
+    );
     channelHandle = channelHandleContainer ? channelHandleContainer.innerText : null;
   } else {
     const href = videoOwnerRenderer.href;