diff --git a/Laptop/laptop.cpp b/Laptop/laptop.cpp
index e460ff3ad..28a94d7c3 100644
--- a/Laptop/laptop.cpp
+++ b/Laptop/laptop.cpp
@@ -1065,6 +1065,10 @@ void ExitLaptop()
 	{
 		ExitLaptopMode(guiCurrentLaptopMode);
 	}
+	else
+	{
+		ExitLaptopMode(guiPreviousLaptopMode);
+	}
 
 	fExitDuringLoad = FALSE;
 	fLoadPendingFlag = FALSE;
@@ -1163,7 +1167,7 @@ void RenderLaptop()
 		return;
 	}
 
-	if(fLoadPendingFlag)
+	if(fLoadPendingFlag || fExitDuringLoad)
 	{
 		uiTempMode = guiCurrentLaptopMode;
 		guiCurrentLaptopMode = guiPreviousLaptopMode;