diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.cpp b/Source/Core/DebuggerWX/Src/CodeWindow.cpp
index ff81a4e1cf..411127873f 100644
--- a/Source/Core/DebuggerWX/Src/CodeWindow.cpp
+++ b/Source/Core/DebuggerWX/Src/CodeWindow.cpp
@@ -1163,9 +1163,11 @@ void CCodeWindow::OnHostMessage(wxCommandEvent& event)
 		case IDM_UPDATESTATUSBAR:
 			//if (main_frame->m_pStatusBar != NULL)
 			{
-				PanicAlert("");
+				// What is this PanicAlert() for?
+				//PanicAlert("");
+
 				//this->GetParent()->m_p
-//this->GetParent()->
+				//this->GetParent()->
 				//parent->m_pStatusBar->SetStatusText(wxT("Hi"), 0);
 				//m_pStatusBar->SetStatusText(event.GetString(), event.GetInt());
 				//this->GetParent()->m_pStatusBar->SetStatusText(event.GetString(), event.GetInt());
diff --git a/Source/Core/DolphinWX/Src/BootManager.cpp b/Source/Core/DolphinWX/Src/BootManager.cpp
index 8e9d6ac233..e165c7741b 100644
--- a/Source/Core/DolphinWX/Src/BootManager.cpp
+++ b/Source/Core/DolphinWX/Src/BootManager.cpp
@@ -179,7 +179,7 @@ bool BootCore(const std::string& _rFilename)
 	// Save some values to our local version of SCoreStartupParameter
 	SConfig::GetInstance().m_LocalCoreStartupParameter.bWii = StartUp.bWii;
 	SConfig::GetInstance().m_LocalCoreStartupParameter.bNTSC = StartUp.bNTSC;
-
+	SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID = StartUp.m_strUniqueID;
 
 #if defined(HAVE_WX) && HAVE_WX
 	if(main_frame)
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 103d9a4b4e..1ff7c731b1 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -388,10 +388,24 @@ void CFrame::DoOpen(bool Boot)
 
 			// Put back the old one
 			VolumeHandler::SetVolumeName(OldName);
-		}	
+		}
+		// Yes it is a valid ISO file
 		else
 		{
-			// Save the current ISO file name
+			std::string OldID = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID;
+			std::string NewID = VolumeHandler::GetVolume()->GetUniqueID();
+
+			// Warn the user if he's selecting a completely different game
+			if(OldID != NewID)
+				wxMessageBox(wxString::Format(
+				"The new game ID '%s' is not the same as the old game ID '%s'."
+				" It is not recommended that you change the disc to another game this way."
+				" It may crash your game. If you want to play another game you"
+				" have to Stop this game and Start a new game."
+				, NewID.c_str(), OldID.c_str())
+				);
+
+			// Save the new ISO file name
 			SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename = std::string(path.ToAscii());
 		}
 	}