diff --git a/ports/stm32/boards/Passport/modules/flows/save_to_microsd_flow.py b/ports/stm32/boards/Passport/modules/flows/save_to_microsd_flow.py
index 75c30d340..97fadd609 100644
--- a/ports/stm32/boards/Passport/modules/flows/save_to_microsd_flow.py
+++ b/ports/stm32/boards/Passport/modules/flows/save_to_microsd_flow.py
@@ -33,7 +33,7 @@ def __init__(self,
 
         # Used in flow_show_card_missing
         self.automatic = automatic
-        self.return_bool = True
+        self.return_bool = False
 
         bind(self, show_card_missing)
 
diff --git a/ports/stm32/boards/Passport/modules/flows/sign_psbt_qr_flow.py b/ports/stm32/boards/Passport/modules/flows/sign_psbt_qr_flow.py
index cbefd37c3..a517d3d99 100644
--- a/ports/stm32/boards/Passport/modules/flows/sign_psbt_qr_flow.py
+++ b/ports/stm32/boards/Passport/modules/flows/sign_psbt_qr_flow.py
@@ -176,7 +176,6 @@ async def save_to_microsd(self):
             self.goto(self.show_success)
             return
 
-        self.written = True
         base = 'QR'
 
         if not self.is_comp:
@@ -196,6 +195,7 @@ async def save_to_microsd(self):
             self.back()
             return
 
+        self.written = True
         self.goto(self.show_success)
 
     async def show_success(self):