diff --git a/system/ui/reset.py b/system/ui/reset.py
index a5cf1731dc..85ce4a858b 100755
--- a/system/ui/reset.py
+++ b/system/ui/reset.py
@@ -126,7 +126,9 @@ def main():
   if mode == ResetMode.FORMAT:
     reset.start_reset()
 
-  for _ in gui_app.render():
+  for showing_dialog in gui_app.render():
+    if showing_dialog:
+      continue
     if not reset.render(rl.Rectangle(45, 200, gui_app.width - 90, gui_app.height - 245)):
       break
 
diff --git a/system/ui/setup.py b/system/ui/setup.py
index e0d737cb1c..4068af01e7 100755
--- a/system/ui/setup.py
+++ b/system/ui/setup.py
@@ -423,7 +423,9 @@ def main():
   try:
     gui_app.init_window("Setup", 20)
     setup = Setup()
-    for _ in gui_app.render():
+    for showing_dialog in gui_app.render():
+      if showing_dialog:
+        continue
       setup.render(rl.Rectangle(0, 0, gui_app.width, gui_app.height))
     setup.close()
   except Exception as e:
diff --git a/system/ui/updater.py b/system/ui/updater.py
index 48903fa5bd..4184c5cb12 100755
--- a/system/ui/updater.py
+++ b/system/ui/updater.py
@@ -158,7 +158,9 @@ def main():
   try:
     gui_app.init_window("System Update")
     updater = Updater(updater_path, manifest_path)
-    for _ in gui_app.render():
+    for showing_dialog in gui_app.render():
+      if showing_dialog:
+        continue
       updater.render(rl.Rectangle(0, 0, gui_app.width, gui_app.height))
   finally:
     # Make sure we clean up even if there's an error