diff --git a/pcsx2/CDVD/CDVD.cpp b/pcsx2/CDVD/CDVD.cpp
index 75f89f3890..f6ddd8297a 100644
--- a/pcsx2/CDVD/CDVD.cpp
+++ b/pcsx2/CDVD/CDVD.cpp
@@ -476,45 +476,42 @@ s32 cdvdReadSubQ(s32 lsn, cdvdSubQ* subq)
 	return ret;
 }
 
-void openVirtualTray()
-{
-	trayState = 1;
-	DiscSwapTimerSeconds = cdvd.RTC.second;
-	cdvd.Status = CDVD_STATUS_TRAY_OPEN;
-	cdvd.Ready = CDVD_NOTREADY;
-}
-// Only trayState is needed right now.
 s32 cdvdCtrlTrayOpen()
 {
+	Console.Warning("Open virtual disk tray");
+	DiscSwapTimerSeconds = cdvd.RTC.second; // remember the PS2 time when this happened
+	cdvd.Status = CDVD_STATUS_TRAY_OPEN;
+	cdvd.Ready = CDVD_NOTREADY;
 	trayState = 1;
-	s32 ret = CDVD->ctrlTrayOpen();
-	if (ret == -1) ret = 0x80;
-	return ret;
+
+	return 0; // needs to be 0 for success according to homebrew test "CDVD"
 }
-// Only trayState is needed right now.
+
 s32 cdvdCtrlTrayClose()
 {
+	Console.Warning("Close virtual disk tray");
+	cdvd.Status = CDVD_STATUS_PAUSE;
+	cdvd.Ready = CDVD_READY1;
 	trayState = 0;
-	s32 ret = CDVD->ctrlTrayClose();
-	if (ret == -1) ret = 0x80;
-	return ret;
+
+	return 0; // needs to be 0 for success according to homebrew test "CDVD"
 }
 
-// Modified by (efp) - 16/01/2006
-// checks if tray was opened since last call to this func
-
-// Outdated and not doing anything.. much.. I hope (rama)
+// Some legacy function, not used anymore
 s32 cdvdGetTrayStatus()
 {
-	s32 ret = CDVD->getTrayStatus();
+	/*s32 ret = CDVD->getTrayStatus();
 
 	if (ret == -1)
 		return(CDVD_TRAY_CLOSE);
 	else
-		return(ret);
+		return(ret);*/
+	return -1;
 }
 
 // Note: Is tray status being kept as a var here somewhere?
+// Yep, and sceCdTrayReq needs it to detect tray state changes (rama)
+
 //   cdvdNewDiskCB() can update it's status as well...
 
 // Modified by (efp) - 16/01/2006
@@ -932,10 +929,7 @@ void cdvdVsync() {
 	{	
 		if ( cdvd.RTC.second != DiscSwapTimerSeconds)
 		{
-			Console.Warning("Close virtual disk tray");
-			trayState = 0;
-			cdvd.Status = CDVD_STATUS_PAUSE;
-			cdvd.Ready = CDVD_READY1;
+			cdvdCtrlTrayClose();
 		}
 	}
 
@@ -1015,8 +1009,7 @@ u8 cdvdRead(u8 key)
 
 		case 0x0B: // TRAY-STATE (if tray has been opened)
 		{
-			u8 tray = cdvdGetTrayStatus();
-			CDVD_LOG("cdvdRead0B(Tray) %x HLE flag = %x ", tray, trayState);
+			CDVD_LOG("cdvdRead0B(Tray) %x", trayState);
 			return /*tray*/ trayState;
 			break;
 		}
@@ -1407,6 +1400,7 @@ static void cdvdWrite16(u8 rt)		 // SCOMMAND
 //	cdvdTN	diskInfo;
 //	cdvdTD	trackInfo;
 //	int i, lbn, type, min, sec, frm, address;
+	static bool oldTrayState = 0;
 	int address;
 	u8 tmp;
 
@@ -1461,9 +1455,15 @@ static void cdvdWrite16(u8 rt)		 // SCOMMAND
 			break;
 
 		case 0x05: // CdTrayReqState  (0:1) - resets the tray open detection
-			trayState = 0;
+			
+			//Console.Warning("CdTrayReqState. trayState = %d oldTrayState = %d",trayState, oldTrayState);
 			SetResultSize(1);
-			cdvd.Result[0] = 0;
+			if (trayState != oldTrayState)
+				cdvd.Result[0] = 1;
+			else
+				cdvd.Result[0] = 0; // old behaviour was always this
+
+			oldTrayState = trayState;
 			break;
 
 		case 0x06: // CdTrayCtrl  (1:1)
diff --git a/pcsx2/CDVD/CDVD.h b/pcsx2/CDVD/CDVD.h
index 61db67fba5..086c5b30e3 100644
--- a/pcsx2/CDVD/CDVD.h
+++ b/pcsx2/CDVD/CDVD.h
@@ -144,6 +144,7 @@ extern u8 cdvdRead(u8 key);
 extern void cdvdWrite(u8 key, u8 rt);
 
 extern void cdvdReloadElfInfo(wxString elfoverride = wxEmptyString);
-extern void openVirtualTray();
+extern s32 cdvdCtrlTrayOpen();
+extern s32 cdvdCtrlTrayClose();
 
 extern wxString DiscSerial;
diff --git a/pcsx2/CDVD/CDVDaccess.cpp b/pcsx2/CDVD/CDVDaccess.cpp
index a3da8f9945..5ffa4dce96 100644
--- a/pcsx2/CDVD/CDVDaccess.cpp
+++ b/pcsx2/CDVD/CDVDaccess.cpp
@@ -294,7 +294,11 @@ CDVD_SourceType CDVDsys_GetSourceType()
 void CDVDsys_ChangeSource( CDVD_SourceType type )
 {
 	GetCorePlugins().Close( PluginId_CDVD );
-
+	
+	static bool firstRun = true;
+	if (!firstRun) cdvdCtrlTrayOpen();
+	firstRun = false;
+	
 	switch( m_CurrentSourceType = type )
 	{
 		case CDVDsrc_Iso:
@@ -400,9 +404,6 @@ void DoCDVDclose()
 		CDVD->close();
 
 	DoCDVDresetDiskTypeCache();
-	
-	Console.Warning("Closing CDVD plugin > open virtual disk tray");
-	openVirtualTray();
 }
 
 s32 DoCDVDreadSector(u8* buffer, u32 lsn, int mode)