From a9fc440775f997fb80e4f48b5781b1c5d7d48e2b Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Mon, 30 Nov 2020 11:06:32 +0100
Subject: [PATCH] fix #6351: set screen attribute right after screen is loaded

---
 electrum/gui/kivy/uix/screens.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/electrum/gui/kivy/uix/screens.py b/electrum/gui/kivy/uix/screens.py
index a949cf47a..ce5425d0d 100644
--- a/electrum/gui/kivy/uix/screens.py
+++ b/electrum/gui/kivy/uix/screens.py
@@ -71,7 +71,6 @@ class CScreen(Factory.Screen):
         pass
 
     def on_activate(self):
-        setattr(self.app, self.kvname + '_screen', self)
         self.update()
 
     def on_leave(self):
@@ -616,6 +615,7 @@ class TabbedCarousel(Factory.TabbedPanel):
         if carousel.current_slide != slide:
             carousel.current_slide.dispatch('on_leave')
             carousel.load_slide(slide)
+            setattr(slide.app, slide.kvname + '_screen', slide)
             slide.dispatch('on_enter')
 
     def add_widget(self, widget, index=0):