diff --git a/driver.c b/driver.c
index 75f00901f9..2655a55780 100644
--- a/driver.c
+++ b/driver.c
@@ -794,8 +794,8 @@ static void init_shader_dir(void)
    if (!*g_settings.video.shader_dir)
       return;
 
-   g_extern.shader_dir.list = dir_list_new(g_settings.video.shader_dir, "shader|cg|cgp", false);
-   if (g_extern.shader_dir.list->size == 0)
+   g_extern.shader_dir.list = dir_list_new(g_settings.video.shader_dir, "shader|cg|cgp|glsl|glslp", false);
+   if (!g_extern.shader_dir.list || g_extern.shader_dir.list->size == 0)
    {
       deinit_shader_dir();
       return;