diff --git a/radio/sdcard/taranis/S6R_Calibrate/S6R_Calibrate.lua b/radio/sdcard/taranis/S6R_Calibrate/S6R_Calibrate.lua
index c7e316abd..9b1599b9f 100644
--- a/radio/sdcard/taranis/S6R_Calibrate/S6R_Calibrate.lua
+++ b/radio/sdcard/taranis/S6R_Calibrate/S6R_Calibrate.lua
@@ -216,15 +216,16 @@ local function runCalibrationPage(event)
     lcd.drawText(0, 56, "Press [Enter] when ready", attr)
   else
     lcd.drawText(0, 9, "Calibration completed", 0)
-    lcd.drawText(0, 56, "Press [Enter] when ready", attr)
+    lcd.drawPixmap(10, 19, "bmp/done.bmp")
+    lcd.drawText(0, 56, "Press [Exit] when ready", attr)
   end
-  if event == EVT_ENTER_BREAK then
+  if calibrationStep > 6 and (event == EVT_ENTER_BREAK or event == EVT_EXIT_BREAK) then
+    return 2
+  elseif event == EVT_ENTER_BREAK then
     calibrationState = 1
   elseif event == EVT_EXIT_BREAK then
     if calibrationStep > 0 then
       calibrationStep = 0
-    else
-      return 2
     end
   end
   return 0
diff --git a/radio/sdcard/taranis/S6R_Calibrate/bmp/done.bmp b/radio/sdcard/taranis/S6R_Calibrate/bmp/done.bmp
new file mode 100644
index 000000000..9ac501398
Binary files /dev/null and b/radio/sdcard/taranis/S6R_Calibrate/bmp/done.bmp differ