diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index db284edf..2c20028f 100644
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -765,6 +765,7 @@ void Texture_ShowDirectory(){
 		strTemp = name;
 		strTemp.MakeLower();
 
+		// avoid effect textures for Q3 texture sets
 		if ( strTemp.Find( ".specular" ) >= 0 ||
 			 strTemp.Find( ".glow" ) >= 0 ||
 			 strTemp.Find( ".bump" ) >= 0 ||
@@ -774,6 +775,15 @@ void Texture_ShowDirectory(){
 			continue;
 		}
 
+		// avoid glow, heightmap, normalmap and specular maps for Q4 texture sets
+		if ( g_str_has_suffix( name, "_g" ) ||
+				g_str_has_suffix( name, "_h" ) ||
+				g_str_has_suffix( name, "_local" ) ||
+				g_str_has_suffix( name, "_nm" ) ||
+				g_str_has_suffix( name, "_s" )) {
+			continue;
+		}
+
 		// avoid ever loading a texture name with spaces
 		if ( strTemp.Find( " " ) >= 0 ) {
 			Sys_FPrintf( SYS_WRN, "WARNING: Skipping texture name with spaces [%s]\n", strTemp.GetBuffer() );