diff --git a/app/components/Form/PayForm.js b/app/components/Form/PayForm.js
index 7a46f994..dd65163a 100644
--- a/app/components/Form/PayForm.js
+++ b/app/components/Form/PayForm.js
@@ -7,6 +7,15 @@ import CurrencyIcon from 'components/CurrencyIcon'
 import styles from './PayForm.scss'
 
 class PayForm extends Component {
+  componentDidUpdate(prevProps) {
+    const { isOnchain, isLn, payform: { payInput } } = this.props
+
+    if (isOnchain) { this.amountInput.focus() }
+    if ((prevProps.payInput !== payInput) && isLn) {
+      console.log('go get the invoice')
+    }
+  }
+
   render() {
     const {
       payform,