diff --git a/src/components/tools/DonationCreate.svelte b/src/components/tools/DonationCreate.svelte
index c156430e..5a339884 100644
--- a/src/components/tools/DonationCreate.svelte
+++ b/src/components/tools/DonationCreate.svelte
@@ -68,13 +68,16 @@
   function resetAll() {
     runnerinfo = { id: 0, firstname: "", lastname: "" };
     donorinfo = { id: 0, firstname: "", lastname: "" };
-    amount = 0;
+    amount = null;
     address_checked = false;
     donor_create_new = false;
     const clears = document.querySelectorAll(".clearSelect");
     clears.forEach(c => {
       c.click();
     });
+    setTimeout(() => {
+      document.querySelector("#wrapper_runner_select input").focus();
+    }, 50);
   }
 
   onMount(() => {