diff --git a/src/components/Controls/Icon.svelte b/src/components/Controls/Icon.svelte
index 0d9f533..1bd250e 100644
--- a/src/components/Controls/Icon.svelte
+++ b/src/components/Controls/Icon.svelte
@@ -8,5 +8,5 @@
 <img
   alt={iconName}
   src={iconUrl}
-  class="control-button cursor-pointer h-9 transition-transform hover:scale-110"
+  class="control-button h-9 transition-transform hover:scale-110"
 />
diff --git a/src/components/Controls/Mute.svelte b/src/components/Controls/Mute.svelte
index 886c3b9..5d28d7f 100644
--- a/src/components/Controls/Mute.svelte
+++ b/src/components/Controls/Mute.svelte
@@ -31,6 +31,6 @@
   };
 </script>
 
-<div on:click={handleClick}>
+<button on:click={handleClick}>
   <Icon iconName={muted ? "unmute" : "mute"} />
-</div>
+</button>
diff --git a/src/components/Controls/PlayPause.svelte b/src/components/Controls/PlayPause.svelte
index f48f9b7..a99e5f7 100644
--- a/src/components/Controls/PlayPause.svelte
+++ b/src/components/Controls/PlayPause.svelte
@@ -11,6 +11,6 @@
   };
 </script>
 
-<div on:click={handleClick}>
+<button on:click={handleClick}>
   <Icon iconName={tracks.every((track) => track.playing) ? "pause" : "play"} />
-</div>
+</button>
diff --git a/src/components/Controls/Shuffle.svelte b/src/components/Controls/Shuffle.svelte
index 0da4e16..671a589 100644
--- a/src/components/Controls/Shuffle.svelte
+++ b/src/components/Controls/Shuffle.svelte
@@ -13,6 +13,6 @@
     );
 </script>
 
-<div on:click={handleClick}>
+<button on:click={handleClick}>
   <Icon iconName="shuffle" />
-</div>
+</button>
diff --git a/src/components/Controls/Switch.svelte b/src/components/Controls/Switch.svelte
index eb8f484..e94f704 100644
--- a/src/components/Controls/Switch.svelte
+++ b/src/components/Controls/Switch.svelte
@@ -8,6 +8,6 @@
   const handleClick = () => forEachTrack(tracks, (track) => track.toggle());
 </script>
 
-<div on:click={handleClick}>
+<button on:click={handleClick}>
   <Icon iconName="switch" />
-</div>
+</button>
diff --git a/src/components/SongList/Modal.svelte b/src/components/SongList/Modal.svelte
index 10124bc..b940612 100644
--- a/src/components/SongList/Modal.svelte
+++ b/src/components/SongList/Modal.svelte
@@ -10,39 +10,83 @@
 
   let closed = false;
 
+  /* BEGIN FOCUS MANAGMENT */
+  // Ideally this would be provided by sv-popup
+
+  function focusModal() {
+    // using setTimeout as a hacky way to wait for the modal to render
+    setTimeout(() => {
+      // @ts-expect-error
+      document.querySelector("#song-selection-modal button[autofocus]").focus();
+      document.getElementById("app").setAttribute("inert", "");
+    });
+  }
+
+  function handleModalClose() {
+    document.getElementById("app").removeAttribute("inert");
+    document.getElementById("song-modal-trigger").focus();
+  }
+
+  function handleEscapeKey({ key }) {
+    if (key === "Escape") {
+      handleModalClose();
+    }
+  };
+
+  function handleClickOutside(event) {
+    if (event.target.classList.contains("modal__container")) {
+      handleModalClose();
+    }
+  }
+
+  /* END FOCUS MANAGMENT */
+
   const setSong = (source, song) => {
     $currentSong = new Song(source, song);
     $appStarted = false;
     closed = true;
+    handleModalClose();
   };
 </script>
 
+<!-- Matches sv-popup https://github.com/sharu725/sv-popup/blob/master/src/lib/Content.svelte#L89 -->
+<svelte:window
+  on:keydown={handleEscapeKey}
+  on:click={handleClickOutside}
+  on:mousedown={handleClickOutside}
+/>
+
 <Modal button={false} bind:close={closed}>
   <Content
     class="bg-black border-2 border-white rounded-md p-8 flex flex-col max-w-xl"
+    id="song-selection-modal"
   >
     <h1 class="text-5xl mb-3">Songs</h1>
     <div class="border-t-4 border-white p-5">
-      {#each Object.values(songs) as source}
+      {#each Object.values(songs) as source, sourceIndex}
         <div class="w-fit">
           <h2 class="text-3xl mb-2">{capitalise(source.name)}</h2>
           <div class="border-t-2 border-white p-3 w-full">
             <ul class="ml-1 text-xl flex flex-col">
-              {#each Object.values(source.songs) as song}
+              {#each Object.values(source.songs) as song, songIndex}
                 <li
-                  class="mb-2 cursor-pointer song transition-transform hover:scale-105 h-fit flex"
-                  on:click={() => setSong(source.name, song.name)}
-                  on:keypress={() => setSong(source.name, song.name)}
+                  class="mb-2 song transition-transform hover:scale-105"
                 >
-                  <div class="h-full w-fit mx-2">
-                    <img
+                  <button
+                    autofocus={sourceIndex === 0 && songIndex === 0 || null}
+                    class="flex"
+                    on:click={() => setSong(source.name, song.name)}
+                  >
+                    <div class="h-full w-fit mx-2">
+                      <img
                       src={playIcon}
                       alt="Play"
                       class="h-[1em] w-[1em] mt-[0.1em]"
-                    />
-                  </div>
-
-                  <div class="">{capitalise(song.name)}</div>
+                      />
+                    </div>
+                    
+                    <div class="">{capitalise(song.name)}</div>
+                  </button>
                 </li>
               {/each}
             </ul>
@@ -52,13 +96,13 @@
     </div>
   </Content>
   <Trigger>
-    <div
+    <button
       class="mr-3 mt-3 md:mr-6 md:mt-6 border-2 border-white rounded-md p-2 md:p-4"
-      on:click={() => (closed = false)}
-      on:keypress={() => (closed = false)}
+      id="song-modal-trigger"
+      on:click={focusModal}
     >
       Now Playing:
       <span class="underline">{capitalise($currentSong.song)}</span>
-    </div>
+    </button>
   </Trigger>
 </Modal>