diff --git a/sys.py/UI/Emulator/fav_list_page.py b/sys.py/UI/Emulator/fav_list_page.py
index ad2dcf4..06de248 100644
--- a/sys.py/UI/Emulator/fav_list_page.py
+++ b/sys.py/UI/Emulator/fav_list_page.py
@@ -338,9 +338,9 @@ class FavListPage(Page):
                     self._Screen.PushPage(self._RomSoConfirmDownloadPage)
                     self._Screen.Draw()
                     self._Screen.SwapAndShow()
-                    return            
 
-    
+            return 
+        
         self._Screen.Draw()
         self._Screen.SwapAndShow()
 
diff --git a/sys.py/UI/Emulator/rom_list_page.py b/sys.py/UI/Emulator/rom_list_page.py
index 56feae2..9738b78 100644
--- a/sys.py/UI/Emulator/rom_list_page.py
+++ b/sys.py/UI/Emulator/rom_list_page.py
@@ -378,7 +378,8 @@ class RomListPage(Page):
                     self._Screen.PushPage(self._RomSoConfirmDownloadPage)
                     self._Screen.Draw()
                     self._Screen.SwapAndShow()
-                    return
+                    
+            return 
             
         self._Screen.Draw()
         self._Screen.SwapAndShow()