diff --git a/avr/modules/lcd2/gui/base/dialog.asm b/avr/modules/lcd2/gui/base/dialog.asm
index da8269b..3ec7220 100644
--- a/avr/modules/lcd2/gui/base/dialog.asm
+++ b/avr/modules/lcd2/gui/base/dialog.asm
@@ -204,10 +204,15 @@ Dialog_OnAbort:
 ; @clobbers any, !Y
 
 Dialog_OnShow:
+  ; check VISIBLE flag
   ldd r16, Y+OBJECT_OFFS_FLAGS
   sbrc r16, WIDGET_FLAGS_VISIBLE_BIT
     rjmp Dialog_OnShow_ret
 
+  ; set VISIBLE flag
+  sbr r16, (1<<WIDGET_FLAGS_VISIBLE_BIT) | (1<<WIDGET_FLAGS_DIRTY_BIT) | (1<<WIDGET_FLAGS_LAYOUT_BIT)
+  std Y+OBJECT_OFFS_FLAGS, r16
+
   bigcall MainWindow_CreateContentWidget
   brcc Dialog_OnShow_ret
 
@@ -221,10 +226,6 @@ Dialog_OnShow:
 Dialog_OnShow_toGui:
   rcall Dialog_toGui
 
-  ; set VISIBLE flag
-  ldd r16, Y+OBJECT_OFFS_FLAGS
-  sbr r16, (1<<WIDGET_FLAGS_VISIBLE_BIT) | (1<<WIDGET_FLAGS_DIRTY_BIT) | (1<<WIDGET_FLAGS_LAYOUT_BIT)
-  std Y+OBJECT_OFFS_FLAGS, r16
 Dialog_OnShow_ret:
   sec
   ret