diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index fdf78a3d5d..3e2bcc1a2b 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -202,6 +202,8 @@ void EmuScreen::bootComplete() {
 	}
 
 	System_SendMessage("event", "startgame");
+
+	saveStateSlot_ = SaveState::GetCurrentSlot();
 }
 
 EmuScreen::~EmuScreen() {
@@ -804,7 +806,7 @@ void EmuScreen::update(InputState &input) {
 		screenManager()->push(new GamePauseScreen(gamePath_));
 	}
 
-	if (saveStatePreview_) {
+	if (saveStatePreview_ && !bootPending_) {
 		int currentSlot = SaveState::GetCurrentSlot();
 		if (saveStateSlot_ != currentSlot) {
 			saveStateSlot_ = currentSlot;