diff --git a/src/Launch.lua b/src/Launch.lua
index 2e383f8c96..e018879cad 100644
--- a/src/Launch.lua
+++ b/src/Launch.lua
@@ -110,6 +110,10 @@ function launch:OnFrame()
 		if self.main.OnFrame then
 			local errMsg = PCall(self.main.OnFrame, self.main)
 			if errMsg then
+				-- Send user to build list menu if a build crashes on initial load
+				if self.main.modes.BUILD.outputRevision == 1 and self.main.modes.BUILD.buildFlag and not self.devMode then
+					main:SetMode("LIST")
+				end
 				self:ShowErrMsg("In 'OnFrame': %s", errMsg)
 			end
 		end