diff --git a/src/components/ChannelGrid.svelte b/src/components/ChannelGrid.svelte
index 143d1e0d7..88e3b72a4 100644
--- a/src/components/ChannelGrid.svelte
+++ b/src/components/ChannelGrid.svelte
@@ -10,7 +10,7 @@
       <div class="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
         <div class="bg-gray-50 dark:bg-gray-700">
           <div class="flex">
-            <div class="w-36 sm:w-52 shrink-0" />
+            <div class="w-36 sm:w-52 shrink-0"></div>
             <div
               class="py-3 px-2 text-xs font-semibold tracking-wider text-left text-gray-400 uppercase dark:text-gray-400 w-52 sm:w-80 shrink-0"
             >
diff --git a/src/components/ChannelPopup.svelte b/src/components/ChannelPopup.svelte
index a11b16aea..218b8741b 100644
--- a/src/components/ChannelPopup.svelte
+++ b/src/components/ChannelPopup.svelte
@@ -18,7 +18,12 @@
   }
 </script>
 
-<div class="relative px-2 py-24 flex justify-center" on:keypress on:click|self={close}>
+<div
+  class="relative px-2 py-24 flex justify-center"
+  role="presentation"
+  on:keypress
+  on:click|self={close}
+>
   <div class="relative bg-white rounded-md shadow dark:bg-gray-800 w-full max-w-[820px]">
     <div
       class="flex justify-between items-center py-3 pl-5 pr-3 md:pr-4 rounded-t border-b dark:border-gray-700"
diff --git a/src/components/Clipboard.svelte b/src/components/Clipboard.svelte
index 3492e47f0..3061bd169 100644
--- a/src/components/Clipboard.svelte
+++ b/src/components/Clipboard.svelte
@@ -17,7 +17,7 @@
 </script>
 
 <slot {copy} />
-<textarea bind:this={textarea} value={text} aria-hidden="true" tabindex="-1" />
+<textarea bind:this={textarea} value={text} aria-hidden="true" tabindex="-1"></textarea>
 
 <style>
   textarea {
diff --git a/src/components/GuidesPopup.svelte b/src/components/GuidesPopup.svelte
index 398f295b4..85bfa406c 100644
--- a/src/components/GuidesPopup.svelte
+++ b/src/components/GuidesPopup.svelte
@@ -6,7 +6,12 @@
   export let guides = []
 </script>
 
-<div class="relative px-2 py-32 flex justify-center" on:keypress on:click|self={close}>
+<div
+  class="relative px-2 py-32 flex justify-center"
+  role="presentation"
+  on:keypress
+  on:click|self={close}
+>
   <div class="relative bg-white rounded-md shadow dark:bg-gray-800 w-full max-w-2xl">
     <div
       class="flex justify-between items-center py-4 pl-5 pr-4 rounded-t border-b dark:border-gray-700"
@@ -34,6 +39,7 @@
       </h3>
       <button
         on:click={close}
+        aria-label="Close"
         type="button"
         class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-full text-sm p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white"
       >
diff --git a/src/components/SearchSyntaxPopup.svelte b/src/components/SearchSyntaxPopup.svelte
index 42638cbfa..61cce7bf5 100644
--- a/src/components/SearchSyntaxPopup.svelte
+++ b/src/components/SearchSyntaxPopup.svelte
@@ -47,7 +47,12 @@
   ]
 </script>
 
-<div class="relative px-2 py-20 flex justify-center" on:keypress on:click|self={close}>
+<div
+  class="relative px-2 py-20 flex justify-center"
+  role="presentation"
+  on:keypress
+  on:click|self={close}
+>
   <div class="relative bg-white rounded-md shadow dark:bg-gray-800 w-full max-w-2xl">
     <div
       class="flex justify-between items-center py-3 pl-5 pr-4 rounded-t border-b dark:border-gray-700"
diff --git a/src/components/StreamsPopup.svelte b/src/components/StreamsPopup.svelte
index ca9a38579..1a7994fc8 100644
--- a/src/components/StreamsPopup.svelte
+++ b/src/components/StreamsPopup.svelte
@@ -9,7 +9,12 @@
   const { close } = getContext('simple-modal')
 </script>
 
-<div class="relative px-2 py-32 flex justify-center" on:keypress on:click|self={close}>
+<div
+  class="relative px-2 py-32 flex justify-center"
+  role="presentation"
+  on:keypress
+  on:click|self={close}
+>
   <div class="relative bg-white rounded-md shadow dark:bg-gray-800 w-full max-w-2xl">
     <div
       class="flex justify-between items-center py-3 pl-5 pr-4 rounded-t border-b dark:border-gray-700"