diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 4708f68718b2..63804b20e290 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6456,8 +6456,9 @@ bool lcd_selftest()
 	
 	if (_result)
 	{
-		lcd_setstatuspgm(_i("Self test OK"));////MSG_SELFTEST_OK c=20
 		calibration_status_set(CALIBRATION_STATUS_SELFTEST);
+		lcd_setstatuspgm(_i("Self test OK"));////MSG_SELFTEST_OK c=20
+		lcd_return_to_status();
 	}
 	else
 	{