diff --git a/resources/js/components/RoomShareButton.vue b/resources/js/components/RoomShareButton.vue
index 6f3f6f4fb..d9a6a093c 100644
--- a/resources/js/components/RoomShareButton.vue
+++ b/resources/js/components/RoomShareButton.vue
@@ -1,5 +1,6 @@
 <template>
   <Button
+    id="room-share-button"
     data-test="room-share-button"
     :label="$t('rooms.invitation.share')"
     icon="fa-solid fa-share-nodes"
@@ -9,78 +10,78 @@
   />
   <Popover ref="op" aria-labelledby="room-invitation-title" aria-modal="false">
     <div class="flex min-w-min flex-col items-start gap-4 p-2">
-      <fieldset class="flex w-full flex-col gap-2">
-        <legend
-          id="room-invitation-title"
-          class="block font-bold whitespace-nowrap"
-        >
-          {{ $t("rooms.invitation.title") }}
-        </legend>
-        <div class="grow">
-          <InputGroup>
-            <InputGroupAddon class="min-w-5 border-none px-0">
-              <i
-                v-tooltip="$t('rooms.invitation.link')"
-                class="fa-solid fa-link"
-                :aria-label="$t('rooms.invitation.link')"
-              />
-            </InputGroupAddon>
-            <InputText
-              id="invitationLink"
-              class="w-full border-surface-0 text-ellipsis shadow-none dark:border-surface-900"
-              :aria-label="$t('rooms.invitation.link')"
-              readonly
-              :value="roomUrl"
-              @focus="$event.target.select()"
+      <h2
+        id="room-invitation-title"
+        tabindex="-1"
+        autofocus
+        class="block font-bold whitespace-nowrap"
+      >
+        {{ $t("rooms.invitation.title") }}
+      </h2>
+      <Button class="sr-only" @click="closePopover">{{
+        $t("app.close")
+      }}</Button>
+      <div class="grow">
+        <InputGroup>
+          <InputGroupAddon class="min-w-5 border-none px-0" aria-hidden="true">
+            <i
+              v-tooltip="$t('rooms.invitation.link')"
+              class="fa-solid fa-link"
+            />
+          </InputGroupAddon>
+          <InputText
+            id="invitationLink"
+            class="w-full border-surface-0 text-ellipsis shadow-none dark:border-surface-900"
+            :aria-label="$t('rooms.invitation.link')"
+            readonly
+            :value="roomUrl"
+            @focus="$event.target.select()"
+          />
+          <InputGroupAddon class="border-none">
+            <Button
+              v-tooltip="$t('rooms.invitation.copy_url')"
+              data-test="room-invitation-copy-link-button"
+              :aria-label="$t('rooms.invitation.copy_url')"
+              icon="fa-solid fa-copy"
+              severity="secondary"
+              @click="copyUrl"
             />
-            <InputGroupAddon class="border-none">
-              <Button
-                v-tooltip="$t('rooms.invitation.copy_url')"
-                data-test="room-invitation-copy-link-button"
-                :aria-label="$t('rooms.invitation.copy_url')"
-                icon="fa-solid fa-copy"
-                severity="secondary"
-                @click="copyUrl"
-              />
-            </InputGroupAddon>
-          </InputGroup>
+          </InputGroupAddon>
+        </InputGroup>
 
-          <InputGroup v-if="room.access_code" class="mt-2">
-            <InputGroupAddon class="min-w-5 border-none px-0">
-              <i
-                v-tooltip="$t('rooms.invitation.code')"
-                class="fa-solid fa-key"
-                :aria-label="$t('rooms.invitation.code')"
-              />
-            </InputGroupAddon>
-            <InputText
-              id="invitationCode"
-              class="w-full border-surface-0 shadow-none dark:border-surface-900"
-              :aria-label="$t('rooms.invitation.code')"
-              readonly
-              :value="formattedAccessCode"
-              @focus="$event.target.select()"
+        <InputGroup v-if="room.access_code" class="mt-2">
+          <InputGroupAddon class="min-w-5 border-none px-0" aria-hidden="true">
+            <i
+              v-tooltip="$t('rooms.invitation.code')"
+              class="fa-solid fa-key"
+            />
+          </InputGroupAddon>
+          <InputText
+            id="invitationCode"
+            class="w-full border-surface-0 shadow-none dark:border-surface-900"
+            :aria-label="$t('rooms.invitation.code')"
+            readonly
+            :value="formattedAccessCode"
+            @focus="$event.target.select()"
+          />
+          <InputGroupAddon class="border-none">
+            <Button
+              v-tooltip="$t('rooms.invitation.copy_code')"
+              data-test="room-invitation-copy-code-button"
+              :aria-label="$t('rooms.invitation.copy_code')"
+              icon="fa-solid fa-copy"
+              severity="secondary"
+              @click="copyCode"
             />
-            <InputGroupAddon class="border-none">
-              <Button
-                v-tooltip="$t('rooms.invitation.copy_code')"
-                data-test="room-invitation-copy-code-button"
-                :aria-label="$t('rooms.invitation.copy_code')"
-                icon="fa-solid fa-copy"
-                severity="secondary"
-                @click="copyCode"
-              />
-            </InputGroupAddon>
-          </InputGroup>
-        </div>
-      </fieldset>
+          </InputGroupAddon>
+        </InputGroup>
+      </div>
       <divider class="m-0" />
       <Button
         data-test="room-copy-invitation-button"
         :label="$t('rooms.invitation.copy_message')"
         class="w-full"
         icon="fa-solid fa-copy"
-        autofocus
         @click="copyInvitationMessage"
       />
     </div>
@@ -136,6 +137,11 @@ function copyCode() {
   toast.success(t("rooms.invitation.copied_code"));
 }
 
+function closePopover() {
+  op.value.hide();
+  document.getElementById("room-share-button").focus();
+}
+
 const roomUrl = computed(() => {
   return (
     settingsStore.getSetting("general.base_url") +