diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp
index dee255f4cc..a50444603e 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp
@@ -134,7 +134,12 @@ HRESULT Init()
 		--d3d_dll_ref;
 		return E_FAIL;
 	}
+
+	// Init the caps structure using data from the currently selected device
+	int adapter = g_Config.iAdapter;
+	D3D->GetDeviceCaps((adapter >= 0 && adapter < std::min(MAX_ADAPTERS, numAdapters)) ? adapter : D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &caps);
 	Enumerate();
+
 	return S_OK;
 }
 
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
index 1b72e26d91..6ed4f32fff 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
@@ -121,8 +121,8 @@ void InitBackendInfo()
 void VideoBackend::ShowConfig(void* parent)
 {
 #if defined(HAVE_WX) && HAVE_WX
-	InitBackendInfo();
 	DX9::D3D::Init();
+	InitBackendInfo();
 
 	// adapters
 	g_Config.backend_info.Adapters.clear();