diff --git a/components/modal/ModalDialog.vue b/components/modal/ModalDialog.vue
index c452ad51..c20696d2 100644
--- a/components/modal/ModalDialog.vue
+++ b/components/modal/ModalDialog.vue
@@ -66,6 +66,8 @@ const { activate } = useFocusTrap(elDialogRoot, {
   allowOutsideClick: true,
   clickOutsideDeactivates: true,
   escapeDeactivates: true,
+  preventScroll: true,
+  returnFocusOnDeactivate: true,
 })
 
 defineExpose({
diff --git a/components/status/StatusAttachment.vue b/components/status/StatusAttachment.vue
index 8de135c8..0c84d736 100644
--- a/components/status/StatusAttachment.vue
+++ b/components/status/StatusAttachment.vue
@@ -126,6 +126,7 @@ useIntersectionObserver(video, (entries) => {
     </template>
     <template v-else>
       <button
+        type="button"
         focus:outline-none
         focus:ring="2 primary inset"
         rounded-lg