diff --git a/gfx/d3d9/d3d9.cpp b/gfx/d3d9/d3d9.cpp
index 4bbbc87ea3..6f925c2378 100644
--- a/gfx/d3d9/d3d9.cpp
+++ b/gfx/d3d9/d3d9.cpp
@@ -448,11 +448,14 @@ D3DVideo::D3DVideo(const video_info_t *info) :
    SetForegroundWindow(hWnd);
    SetFocus(hWnd);
 
+   // This should only be done once here
+   // to avoid set_shader() to be overridden
+   // later.
 #ifdef HAVE_CG
-    auto shader_type = g_settings.video.shader_type;
-    if ((shader_type == RARCH_SHADER_CG ||
-		 shader_type == RARCH_SHADER_AUTO) && *g_settings.video.cg_shader_path)
-        cg_shader = g_settings.video.cg_shader_path;
+   auto shader_type = g_settings.video.shader_type;
+   if ((shader_type == RARCH_SHADER_CG ||
+            shader_type == RARCH_SHADER_AUTO) && *g_settings.video.cg_shader_path)
+      cg_shader = g_settings.video.cg_shader_path;
 #endif
 
    video_info = *info;