diff --git a/src/Launch.lua b/src/Launch.lua
index 2d5305cd5c..6223952490 100644
--- a/src/Launch.lua
+++ b/src/Launch.lua
@@ -357,6 +357,9 @@ function launch:ShowPrompt(r, g, b, str, func)
 	self.promptFunc = func or function(key)
 		if key == "RETURN" or key == "ESCAPE" then
 			return true
+		elseif key == "F4" then
+			self.main:SetMode("LIST")
+			return true
 		elseif key == "c" and IsKeyDown("CTRL") then
 			local cleanStr = str:gsub("%^%d", "")
 			Copy(cleanStr)
@@ -372,7 +375,7 @@ function launch:ShowErrMsg(fmt, ...)
 		local version = self.versionNumber and 
 			"^8v"..self.versionNumber..(self.versionBranch and " "..self.versionBranch or "")
 			or ""
-		self:ShowPrompt(1, 0, 0, "^1Error:\n\n^0"..string.format(fmt, ...).."\n"..version.."\n^0Press Enter/Escape to dismiss, or F5 to restart the application.\nPress CTRL + C to copy error text.")
+		self:ShowPrompt(1, 0, 0, "^1Error:\n\n^0"..string.format(fmt, ...).."\n"..version.."\n^0Press Enter/Escape to dismiss, F4 to return to build selection, or F5 to restart the application.\nPress CTRL + C to copy error text.")
 	end
 end