From 2c790cbc164595f83401b4fc84d4cf4da536602b Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sun, 25 Apr 2021 13:48:38 +0200
Subject: [PATCH] Fix focus issue when leaving "Setup Widget" screen.

---
 radio/src/gui/colorlcd/screen_setup.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/radio/src/gui/colorlcd/screen_setup.cpp b/radio/src/gui/colorlcd/screen_setup.cpp
index b981992d2..856eaffa0 100644
--- a/radio/src/gui/colorlcd/screen_setup.cpp
+++ b/radio/src/gui/colorlcd/screen_setup.cpp
@@ -188,8 +188,6 @@ class SetupWidgetsPage: public FormWindow
 
     void deleteLater(bool detach = true, bool trash = true) override
     {
-      Layer::pop(this);
-
 #if defined(HARDWARE_TOUCH)
       Keyboard::hide();
 #endif
@@ -204,6 +202,7 @@ class SetupWidgetsPage: public FormWindow
 
       // restore screen setting tab on top
       menu->bringToTop();
+      Layer::pop(this);
     }
 
 #if defined(HARDWARE_TOUCH)