diff --git a/pcsx2/CDVD/CDVDaccess.cpp b/pcsx2/CDVD/CDVDaccess.cpp
index 128fd61081..517449d6df 100644
--- a/pcsx2/CDVD/CDVDaccess.cpp
+++ b/pcsx2/CDVD/CDVDaccess.cpp
@@ -370,8 +370,6 @@ bool DoCDVDopen()
 		return true;
 	}
 
-	// TODO: Add a blockdumps configurable folder, and use that instead of CWD().
-
 	// TODO: "Untitled" should use pnach/slus name resolution, slus if no patch,
 	// and finally an "Untitled-[ElfCRC]" if no slus.
 
@@ -379,7 +377,10 @@ bool DoCDVDopen()
 	if( somepick.IsEmpty() )
 		somepick = L"Untitled";
 
-	wxString temp( Path::Combine( wxGetCwd(), somepick ) );
+	if (g_Conf->CurrentBlockdump.IsEmpty())
+        g_Conf->CurrentBlockdump = wxGetCwd();
+
+	wxString temp(Path::Combine(g_Conf->CurrentBlockdump, somepick));
 
 #ifdef ENABLE_TIMESTAMPS
 	wxDateTime curtime( wxDateTime::GetTimeNow() );
diff --git a/pcsx2/gui/AppConfig.cpp b/pcsx2/gui/AppConfig.cpp
index 85a358ca05..1d227ce811 100644
--- a/pcsx2/gui/AppConfig.cpp
+++ b/pcsx2/gui/AppConfig.cpp
@@ -640,6 +640,7 @@ void AppConfig::LoadSaveRootItems( IniInterface& ini )
 	ini.Entry( L"CurrentIso", res, res, ini.IsLoading() || IsPortable() );
 	CurrentIso = res.GetFullPath();
 
+	IniEntry( CurrentBlockdump );
 	IniEntry( CurrentELF );
 	IniEntry( CurrentIRX );
 
diff --git a/pcsx2/gui/AppConfig.h b/pcsx2/gui/AppConfig.h
index 966d7bb63d..8cf97f05f7 100644
--- a/pcsx2/gui/AppConfig.h
+++ b/pcsx2/gui/AppConfig.h
@@ -323,6 +323,7 @@ public:
 	bool		AskOnBoot;
 
 	wxString				CurrentIso;
+    wxString				CurrentBlockdump;
 	wxString				CurrentELF;
 	wxString				CurrentIRX;
 	CDVD_SourceType			CdvdSource;