diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index 0ea08ddf27..e38d5d3ccb 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -344,7 +344,6 @@ void GameButton::Draw(UIContext &dc) {
 		dc.PushScissor(bounds_);
 		const std::string currentTitle = ginfo->GetTitle();
 		if (!currentTitle.empty()) {
-			title_ = ReplaceAll(currentTitle + discNumInfo, "&", "&&");
 			title_ = ReplaceAll(title_, "\n", " ");
 		}
 
diff --git a/UI/Store.cpp b/UI/Store.cpp
index 9c9dbc281b..fcc8540d53 100644
--- a/UI/Store.cpp
+++ b/UI/Store.cpp
@@ -489,7 +489,7 @@ void StoreScreen::ParseListing(const std::string &json) {
 			e.type = ENTRY_PBPZIP;
 			e.name = GetTranslatedString(game, "name");
 			e.description = GetTranslatedString(game, "description", "");
-			e.author = ReplaceAll(game.getStringOr("author", "?"), "&&", "&");  // Can't remove && in the JSON source data due to old app versions
+			e.author = ReplaceAll(game.getStringOr("author", "?"), "&&", "&");  // Can't remove && in the JSON source data due to old app versions, so we do the opposite replacement here.
 			e.size = game.getInt("size");
 			e.downloadURL = game.getStringOr("download-url", "");
 			e.iconURL = game.getStringOr("icon-url", "");