diff --git a/packages/app/src/Element/NoteCreator.tsx b/packages/app/src/Element/NoteCreator.tsx
index a338c5a2..581259ac 100644
--- a/packages/app/src/Element/NoteCreator.tsx
+++ b/packages/app/src/Element/NoteCreator.tsx
@@ -27,6 +27,8 @@ import type { RootState } from "State/Store";
 import { LNURL } from "LNURL";
 
 import messages from "./messages";
+import { ClipboardEventHandler, useState } from "react";
+import Spinner from "Icons/Spinner";
 
 interface NotePreviewProps {
   note: TaggedRawEvent;
@@ -58,6 +60,7 @@ export function NoteCreator() {
   const zapForward = useSelector((s: RootState) => s.noteCreator.zapForward);
   const sensitive = useSelector((s: RootState) => s.noteCreator.sensitive);
   const pollOptions = useSelector((s: RootState) => s.noteCreator.pollOptions);
+  const [uploadInProgress, setUploadInProgress] = useState(false);
   const dispatch = useDispatch();
 
   async function sendNote() {
@@ -99,6 +102,19 @@ export function NoteCreator() {
   async function attachFile() {
     try {
       const file = await openFile();
+      if (file) {
+        uploadFile(file);
+      }
+    } catch (error: unknown) {
+      if (error instanceof Error) {
+        dispatch(setError(error?.message));
+      }
+    }
+  }
+
+  async function uploadFile(file: File | Blob) {
+    setUploadInProgress(true);
+    try {
       if (file) {
         const rx = await uploader.upload(file, file.name);
         if (rx.url) {
@@ -111,6 +127,8 @@ export function NoteCreator() {
       if (error instanceof Error) {
         dispatch(setError(error?.message));
       }
+    } finally {
+      setUploadInProgress(false);
     }
   }
 
@@ -205,6 +223,25 @@ export function NoteCreator() {
     }
   }
 
+  const handlePaste: ClipboardEventHandler<HTMLDivElement> = evt => {
+    if (evt.clipboardData) {
+      const clipboardItems = evt.clipboardData.items;
+      const items: DataTransferItem[] = Array.from(clipboardItems).filter(function (item: DataTransferItem) {
+        // Filter the image items only
+        return /^image\//.test(item.type);
+      });
+      if (items.length === 0) {
+        return;
+      }
+
+      const item = items[0];
+      const blob = item.getAsFile();
+      if (blob) {
+        uploadFile(blob);
+      }
+    }
+  };
+
   return (
     <>
       {show && (
@@ -212,7 +249,9 @@ export function NoteCreator() {
           {replyTo && <NotePreview note={replyTo} />}
           {preview && getPreviewNote()}
           {!preview && (
-            <div className={`flex note-creator${replyTo ? " note-reply" : ""}${pollOptions ? " poll" : ""}`}>
+            <div
+              onPaste={handlePaste}
+              className={`flex note-creator${replyTo ? " note-reply" : ""}${pollOptions ? " poll" : ""}`}>
               <div className="flex f-col f-grow">
                 <Textarea
                   autoFocus
@@ -242,6 +281,7 @@ export function NoteCreator() {
             </div>
           )}
           <div className="note-creator-actions">
+            {uploadInProgress && <Spinner />}
             <button className="secondary" type="button" onClick={() => dispatch(setShowAdvanced(!showAdvanced))}>
               <FormattedMessage defaultMessage="Advanced" />
             </button>
diff --git a/packages/app/src/translations/ar_SA.json b/packages/app/src/translations/ar_SA.json
index 787f1e1b..f0fa5f44 100644
--- a/packages/app/src/translations/ar_SA.json
+++ b/packages/app/src/translations/ar_SA.json
@@ -338,4 +338,4 @@
   "zjJZBd": "انت جاهز!",
   "zonsdq": "فشل تحميل خدمة LNURL",
   "zvCDao": "تظهر تلقائيا أحدث الملاحظات"
-}
\ No newline at end of file
+}
diff --git a/packages/app/src/translations/da_DK.json b/packages/app/src/translations/da_DK.json
index 598da524..740943c9 100644
--- a/packages/app/src/translations/da_DK.json
+++ b/packages/app/src/translations/da_DK.json
@@ -338,4 +338,4 @@
   "zjJZBd": "You're ready!",
   "zonsdq": "Failed to load LNURL service",
   "zvCDao": "Automatically show latest notes"
-}
\ No newline at end of file
+}
diff --git a/packages/app/src/translations/de_DE.json b/packages/app/src/translations/de_DE.json
index 130632cb..f14c563f 100644
--- a/packages/app/src/translations/de_DE.json
+++ b/packages/app/src/translations/de_DE.json
@@ -338,4 +338,4 @@
   "zjJZBd": "Sie sind bereit!",
   "zonsdq": "Fehler beim Laden des LNURL-Dienstes",
   "zvCDao": "Neueste Beiträge automatisch anzeigen"
-}
\ No newline at end of file
+}
diff --git a/packages/app/src/translations/en.json b/packages/app/src/translations/en.json
index d81fbd86..d62d7664 100644
--- a/packages/app/src/translations/en.json
+++ b/packages/app/src/translations/en.json
@@ -343,4 +343,4 @@
   "zjJZBd": "You're ready!",
   "zonsdq": "Failed to load LNURL service",
   "zvCDao": "Automatically show latest notes"
-}
\ No newline at end of file
+}
diff --git a/packages/app/src/translations/es_ES.json b/packages/app/src/translations/es_ES.json
index b742b4c8..8d5191aa 100644
--- a/packages/app/src/translations/es_ES.json
+++ b/packages/app/src/translations/es_ES.json
@@ -338,4 +338,4 @@
   "zjJZBd": "Estás listo!",
   "zonsdq": "Error al contactar con el servicio LNURL",
   "zvCDao": "Mostrar notas nuevas automáticamente"
-}
\ No newline at end of file
+}
diff --git a/packages/app/src/translations/fr_FR.json b/packages/app/src/translations/fr_FR.json
index 9b0146bf..006cbebe 100644
--- a/packages/app/src/translations/fr_FR.json
+++ b/packages/app/src/translations/fr_FR.json
@@ -338,4 +338,4 @@
   "zjJZBd": "Tu es prêt!",
   "zonsdq": "Échec du chargement du service LNURL",
   "zvCDao": "Afficher automatiquement les dernières notes"
-}
\ No newline at end of file
+}
diff --git a/packages/app/src/translations/hr_HR.json b/packages/app/src/translations/hr_HR.json
index 46d74c21..6a8f31f9 100644
--- a/packages/app/src/translations/hr_HR.json
+++ b/packages/app/src/translations/hr_HR.json
@@ -338,4 +338,4 @@
   "zjJZBd": "Spremni ste!",
   "zonsdq": "Neuspješno učitavanje LNURL usluge",
   "zvCDao": "Automatski prikaži najnovije bilješke"
-}
\ No newline at end of file
+}
diff --git a/packages/app/src/translations/hu_HU.json b/packages/app/src/translations/hu_HU.json
index 8d672a63..d5f10d49 100644
--- a/packages/app/src/translations/hu_HU.json
+++ b/packages/app/src/translations/hu_HU.json
@@ -338,4 +338,4 @@
   "zjJZBd": "Készen vagy!",
   "zonsdq": "Az LNURL szolgáltatás betöltése nem sikerült",
   "zvCDao": "Automatikusan a legfrissebb bejegyzéseket mutassa"
-}
\ No newline at end of file
+}
diff --git a/packages/app/src/translations/id_ID.json b/packages/app/src/translations/id_ID.json
index 8fdedcb0..38ac2690 100644
--- a/packages/app/src/translations/id_ID.json
+++ b/packages/app/src/translations/id_ID.json
@@ -338,4 +338,4 @@
   "zjJZBd": "Anda siap!",
   "zonsdq": "Gagal memuat layanan LNURL",
   "zvCDao": "Tampilkan catatan terbaru secara otomatis"
-}
\ No newline at end of file
+}
diff --git a/packages/app/src/translations/it_IT.json b/packages/app/src/translations/it_IT.json
index 1bc27733..4c3e95a6 100644
--- a/packages/app/src/translations/it_IT.json
+++ b/packages/app/src/translations/it_IT.json
@@ -338,4 +338,4 @@
   "zjJZBd": "Sei pronto!",
   "zonsdq": "Caricamento del servizio LNURL fallito",
   "zvCDao": "Visualizza automaticamente le ultime note"
-}
\ No newline at end of file
+}
diff --git a/packages/app/src/translations/ja_JP.json b/packages/app/src/translations/ja_JP.json
index 5422029d..68462f7c 100644
--- a/packages/app/src/translations/ja_JP.json
+++ b/packages/app/src/translations/ja_JP.json
@@ -338,4 +338,4 @@
   "zjJZBd": "準備完了！",
   "zonsdq": "LNURLサービスの読み込みに失敗しました",
   "zvCDao": "最新の記事を自動で表示する"
-}
\ No newline at end of file
+}
diff --git a/packages/app/src/translations/ko_KR.json b/packages/app/src/translations/ko_KR.json
index 598da524..740943c9 100644
--- a/packages/app/src/translations/ko_KR.json
+++ b/packages/app/src/translations/ko_KR.json
@@ -338,4 +338,4 @@
   "zjJZBd": "You're ready!",
   "zonsdq": "Failed to load LNURL service",
   "zvCDao": "Automatically show latest notes"
-}
\ No newline at end of file
+}
diff --git a/packages/app/src/translations/nl_NL.json b/packages/app/src/translations/nl_NL.json
index 598da524..740943c9 100644
--- a/packages/app/src/translations/nl_NL.json
+++ b/packages/app/src/translations/nl_NL.json
@@ -338,4 +338,4 @@
   "zjJZBd": "You're ready!",
   "zonsdq": "Failed to load LNURL service",
   "zvCDao": "Automatically show latest notes"
-}
\ No newline at end of file
+}
diff --git a/packages/app/src/translations/ru_RU.json b/packages/app/src/translations/ru_RU.json
index 5d5e70bd..717648c9 100644
--- a/packages/app/src/translations/ru_RU.json
+++ b/packages/app/src/translations/ru_RU.json
@@ -338,4 +338,4 @@
   "zjJZBd": "Готово!",
   "zonsdq": "Не удалось загрузить службу LNURL",
   "zvCDao": "Автоматически показывать новые заметки"
-}
\ No newline at end of file
+}
diff --git a/packages/app/src/translations/sv_SE.json b/packages/app/src/translations/sv_SE.json
index a82a39b2..9565c3c3 100644
--- a/packages/app/src/translations/sv_SE.json
+++ b/packages/app/src/translations/sv_SE.json
@@ -338,4 +338,4 @@
   "zjJZBd": "Du är redo!",
   "zonsdq": "Det gick inte att ladda LNURL-tjänsten",
   "zvCDao": "Visa automatiskt de senaste anteckningarna"
-}
\ No newline at end of file
+}
diff --git a/packages/app/src/translations/zh_CN.json b/packages/app/src/translations/zh_CN.json
index 00287779..44954812 100644
--- a/packages/app/src/translations/zh_CN.json
+++ b/packages/app/src/translations/zh_CN.json
@@ -338,4 +338,4 @@
   "zjJZBd": "你已准备就绪！",
   "zonsdq": "加载 LNURL 服务失败",
   "zvCDao": "自动显示最新便条"
-}
\ No newline at end of file
+}
diff --git a/packages/app/src/translations/zh_TW.json b/packages/app/src/translations/zh_TW.json
index f04adcea..9e3a4412 100644
--- a/packages/app/src/translations/zh_TW.json
+++ b/packages/app/src/translations/zh_TW.json
@@ -338,4 +338,4 @@
   "zjJZBd": "你已經準備就緒！",
   "zonsdq": "加載 LNURL 服務失敗",
   "zvCDao": "自動顯示最新便條"
-}
\ No newline at end of file
+}