diff --git a/js/client-mainmenu.js b/js/client-mainmenu.js
index b19863c88..8c40f25a6 100644
--- a/js/client-mainmenu.js
+++ b/js/client-mainmenu.js
@@ -922,7 +922,9 @@
 					}
 					bufs[curBuf] += '<li><h3>' + Tools.escapeHTML(curSection) + '</li>';
 				}
-				var formatName = (curSection.slice(0, 4) === 'ORAS' ? '[Gen 6] ' : '') + Tools.escapeFormat(format.id).replace('[Gen 7] ', '');
+				var formatName = Tools.escapeFormat(format.id);
+				if (formatName.charAt(0) !== '[') formatName = '[Gen 6] ' + formatName;
+				formatName = formatName.replace('[Gen 7] ', '');
 				bufs[curBuf] += '<li><button name="selectFormat" value="' + i + '"' + (curFormat === i ? ' class="sel"' : '') + '>' + formatName + '</button></li>';
 			}