diff --git a/src/filesrch.c b/src/filesrch.c
index 5fd118403..3e9a879cb 100644
--- a/src/filesrch.c
+++ b/src/filesrch.c
@@ -702,11 +702,9 @@ boolean preparefilemenu(boolean samedepth)
 					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;
-				}
+
+				if (!strcmp(dent->d_name, configfile))
+					ext |= EXT_LOADED;
 
 				folder = 0;
 			}
diff --git a/src/m_menu.c b/src/m_menu.c
index cde2ae902..5682e8883 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -4912,7 +4912,7 @@ static void M_DrawAddons(void)
 
 			V_DrawSmallScaledPatch(x-(16+4), y, (flags & V_TRANSLUCENT), addonsp[((UINT8)(dirmenu[i][DIR_TYPE]) & ~EXT_LOADED)]);
 
-			if ((type & EXT_LOADED) && ((type &~ EXT_LOADED) >= EXT_LOADSTART))
+			if (type & EXT_LOADED)
 				V_DrawSmallScaledPatch(x-(16+4), y, 0, addonsp[NUM_EXT+3]);
 
 			if ((size_t)i == dir_on[menudepthleft])