diff --git a/src/filesrch.c b/src/filesrch.c
index 8b6f99dad..ed4254f80 100644
--- a/src/filesrch.c
+++ b/src/filesrch.c
@@ -697,6 +697,16 @@ boolean preparefilemenu(boolean samedepth)
 						ext |= EXT_LOADED;
 					}
 				}
+				else if (ext == EXT_TXT)
+				{
+					if (!strcmp(dent->d_name, "log.txt") || !strcmp(dent->d_name, "errorlog.txt"))
+						ext |= EXT_LOADED;
+				}
+				else if (ext == EXT_CFG)
+				{
+					if (!strcmp(dent->d_name, "config.cfg"))
+						ext |= EXT_LOADED;
+				}
 
 				folder = 0;
 			}
diff --git a/src/m_menu.c b/src/m_menu.c
index dcebcfec3..af5b406c3 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -4906,7 +4906,7 @@ static void M_DrawAddons(void)
 
 			V_DrawSmallScaledPatch(x-(16+4), y, (flags & V_TRANSLUCENT), addonsp[((UINT8)(dirmenu[i][DIR_TYPE]) & ~EXT_LOADED)]);
 
-			if (dirmenu[i][DIR_TYPE] & EXT_LOADED)
+			if ((dirmenu[i][DIR_TYPE] & EXT_LOADED) && dirmenu[i][DIR_TYPE] >= EXT_LOADSTART)
 				V_DrawSmallScaledPatch(x-(16+4), y, 0, addonsp[NUM_EXT+3]);
 
 			if ((size_t)i == dir_on[menudepthleft])