diff --git a/android/app/build.gradle b/android/app/build.gradle
index a29d43a..cd0ac1d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -27,8 +27,8 @@ android {
         applicationId "com.paarrot.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1777176952
-        versionName "2026-04-26.041552.151"
+        versionCode 1778632712
+        versionName "2026-05-13.003832.344"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
diff --git a/cinny b/cinny
index 7ef9939..b2fd65c 160000
--- a/cinny
+++ b/cinny
@@ -1 +1 @@
-Subproject commit 7ef9939d8aab11973397c9e18b2df111e93e42f8
+Subproject commit b2fd65c8cb95270ef5b3e4ba1fbb6b6a13436814
diff --git a/overlay/src/app/features/ShareRoomPicker.tsx b/overlay/src/app/features/ShareRoomPicker.tsx
index 269dd1f..b2a7a92 100644
--- a/overlay/src/app/features/ShareRoomPicker.tsx
+++ b/overlay/src/app/features/ShareRoomPicker.tsx
@@ -127,7 +127,8 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
   const fileCount = share.files.length;
 
   return (
-    <Overlay open backdrop={<OverlayBackdrop />}>
+    <>
+      <Overlay open>
       <FocusTrap
         focusTrapOptions={{
           initialFocus: false,
@@ -144,16 +145,17 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
             inset: 0,
             zIndex: 999,
             backgroundColor: '#1a1d23',
+            paddingTop: '60px',
           }}
         >
           <Header
             size="500"
-            style={{ padding: config.space.S400, paddingTop: '60px' }}
+            style={{ padding: config.space.S400 }}
           >
-            <Box grow="Yes" direction="Column" gap="100">
+            <Box grow="Yes" direction="Column" gap="100" style={{ minWidth: 0, maxWidth: '80%' }}>
               <Text size="H4">Share to Room</Text>
               {(previewText || fileCount > 0) && (
-                <Text size="T200" priority="300" style={{ opacity: 0.7 }}>
+                <Text size="T200" priority="300" style={{ opacity: 0.7, wordBreak: 'break-word', whiteSpace: 'normal' }}>
                   {previewText
                     ? `"${previewText}${(share.text?.length ?? 0) > 80 ? '…' : ''}"`
                     : `${fileCount} file${fileCount !== 1 ? 's' : ''}`}
@@ -170,6 +172,7 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
           <Box
             style={{
               padding: config.space.S200,
+              paddingTop: config.space.S300,
             }}
           >
             <Input
@@ -185,7 +188,7 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
           </Box>
 
           <Scroll ref={scrollRef} size="300" hideTrack style={{ flex: 1, minHeight: 0 }}>
-            <Box style={{ padding: config.space.S300, paddingTop: config.space.S300 }} direction="Column">
+            <Box style={{ padding: config.space.S300 }} direction="Column">
               {vItems.length === 0 && (
                 <Box
                   style={{ padding: `${config.space.S700} 0` }}
@@ -261,13 +264,15 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
           </Scroll>
         </Box>
       </FocusTrap>
+    </Overlay>
 
-      {confirmRoomId && (() => {
-        const room = getRoom(confirmRoomId);
-        const roomName = room?.name ?? confirmRoomId;
-        const isDm = mDirects.has(confirmRoomId);
-        return (
-          <OverlayCenter style={{ zIndex: 9999 }}>
+    {confirmRoomId && (() => {
+      const room = getRoom(confirmRoomId);
+      const roomName = room?.name ?? confirmRoomId;
+      const isDm = mDirects.has(confirmRoomId);
+      return (
+        <Overlay open backdrop={<OverlayBackdrop />}>
+          <OverlayCenter>
             <FocusTrap
               focusTrapOptions={{
                 initialFocus: false,
@@ -275,9 +280,9 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
                 escapeDeactivates: stopPropagation,
               }}
             >
-              <Modal size="300" style={{ zIndex: 9999 }}>
-                <Box direction="Column" gap="100" style={{ padding: config.space.S400 }}>
-                  <Box direction="Column" gap="200">
+              <Modal size="300" style={{ maxWidth: '280px', maxHeight: 'fit-content' }}>
+                <Box direction="Column" gap="100" style={{ padding: config.space.S300 }}>
+                  <Box direction="Column" gap="100">
                     <Text size="H4">Share to {isDm ? 'Person' : 'Room'}?</Text>
                     <Text size="T300" priority="300">
                       Send to <strong>{roomName}</strong>?
@@ -303,8 +308,9 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
               </Modal>
             </FocusTrap>
           </OverlayCenter>
-        );
-      })()}
-    </Overlay>
+        </Overlay>
+      );
+    })()}
+    </>
   );
 }