diff --git a/pcsx2/System/SysCoreThread.cpp b/pcsx2/System/SysCoreThread.cpp
index 3eed44ff3b..e5c3a29acb 100644
--- a/pcsx2/System/SysCoreThread.cpp
+++ b/pcsx2/System/SysCoreThread.cpp
@@ -15,7 +15,7 @@
 
 #include "PrecompiledHeader.h"
 #include "Common.h"
-
+#include "gui/App.h"
 #include "IopBios.h"
 
 #include "Counters.h"
@@ -240,6 +240,7 @@ bool SysCoreThread::StateCheckInThread()
 void SysCoreThread::DoCpuExecute()
 {
 	m_hasActiveMachine = true;
+	UI_EnableSysActions();
 	Cpu->Execute();
 }
 
diff --git a/pcsx2/gui/UpdateUI.cpp b/pcsx2/gui/UpdateUI.cpp
index ebc9160399..a8605a46be 100644
--- a/pcsx2/gui/UpdateUI.cpp
+++ b/pcsx2/gui/UpdateUI.cpp
@@ -46,7 +46,8 @@ void UI_UpdateSysControls()
 
 	sApp.PostAction( CoreThreadStatusEvent( CoreThread_Indeterminate ) );
 
-	_SaveLoadStuff( true );
+	//_SaveLoadStuff( true );
+	_SaveLoadStuff( SysHasValidState() );
 }
 
 void UI_DisableSysReset()