diff --git a/gui/kivy/main_window.py b/gui/kivy/main_window.py
index d399c1b3..178c2239 100644
--- a/gui/kivy/main_window.py
+++ b/gui/kivy/main_window.py
@@ -180,7 +180,6 @@ class ElectrumWindow(App):
         self.nfcscanner = None
         self.tabs = None
         self.is_exit = False
-        self.current_invoice = None
 
         super(ElectrumWindow, self).__init__(**kwargs)
 
@@ -223,9 +222,8 @@ class ElectrumWindow(App):
                 if pr.has_expired():
                     self.show_error(_('Payment request has expired'))
                 else:
-                    self.current_invoice = pr
-                    self.update_tab('send')
                     self.switch_to('send')
+                    self.send_screen.set_request(pr)
         else:
             self.show_error("invoice error:" + pr.error)
             self.send_screen.do_clear()
diff --git a/gui/kivy/uix/screens.py b/gui/kivy/uix/screens.py
index 682bfa5d..a5124dd2 100644
--- a/gui/kivy/uix/screens.py
+++ b/gui/kivy/uix/screens.py
@@ -192,8 +192,7 @@ class SendScreen(CScreen):
             self.screen.amount = self.app.format_amount_and_units(amount)
 
     def update(self):
-        if self.app.current_invoice:
-            self.set_request(self.app.current_invoice)
+        pass
 
     def do_clear(self):
         self.screen.amount = ''