diff --git a/src/App.svelte b/src/App.svelte
index 3a943dd..a08d1fd 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -215,4 +215,4 @@
   </SiteCard>
 </SiteDeck>
 
-<PayFlow bind:lnurl={getInvoiceFor}/>
+<PayFlow bind:lnurl={getInvoiceFor} hasAmount={amounts[payway.id]}/>
diff --git a/src/InputMask.svelte b/src/InputMask.svelte
index 48acd75..8d6cbc2 100644
--- a/src/InputMask.svelte
+++ b/src/InputMask.svelte
@@ -16,6 +16,7 @@
   let input;
   export let value = null;
   export let isComplete = false;
+  export let focusOnMount = false;
 
   let maskRef, imask, unmask, attrs;
 
@@ -55,6 +56,8 @@
 
   onMount(() => {
     maskRef = IMask(input, imask);
+    if (focusOnMount)
+      input.focus();
     setValue(value);
   });
 
diff --git a/src/PayFlow.svelte b/src/PayFlow.svelte
index 8b55f22..38c8987 100644
--- a/src/PayFlow.svelte
+++ b/src/PayFlow.svelte
@@ -10,6 +10,7 @@
   import Tipped from './Tipped.svelte';
 
   export let lnurl = undefined;
+  export let hasAmount;
   let isOpen;
   let res1;
   let res2;
@@ -87,7 +88,9 @@
 
 </script>
 
-<Modal {isOpen} toggle={dismiss} on:open={()=>cancelButton.focus()} size='lg'>
+<Modal {isOpen} toggle={dismiss}
+       on:open="{()=>{if (hasAmount) cancelButton.focus()}}"
+       size='lg'>
   <ModalHeader>BOLT11 invoice: {stage}</ModalHeader>
   <ModalBody>
     {#if confirmAmount}
@@ -97,7 +100,8 @@
 	  <div class="input-group">
 	    {#key minSendSat}
 	    <InputMask bind:value={amount}
-		       autofocus
+		       bind:this={input}
+		       focusOnMount={true}
 		       unmask
 		       imask={{
 		       mask: Number, scale:0,