diff --git a/src/components/compose.jsx b/src/components/compose.jsx
index e2e7b94c..143a1f24 100644
--- a/src/components/compose.jsx
+++ b/src/components/compose.jsx
@@ -383,6 +383,7 @@ function Compose({
                 // );
 
                 const newWin = openCompose({
+                  uid: UID.current,
                   editStatus,
                   replyToStatus,
                   draftStatus: {
diff --git a/src/utils/open-compose.js b/src/utils/open-compose.js
index 48579c4e..c50a7bc5 100644
--- a/src/utils/open-compose.js
+++ b/src/utils/open-compose.js
@@ -5,9 +5,10 @@ export default function openCompose(opts) {
   const top = Math.max(0, (screenHeight - 450) / 2);
   const width = Math.min(screenWidth, 600);
   const height = Math.min(screenHeight, 450);
+  const winUID = opts.uid || Math.random();
   const newWin = window.open(
     url,
-    'compose' + Math.random(),
+    'compose' + winUID,
     `width=${width},height=${height},left=${left},top=${top}`,
   );