diff --git a/pkg/app/app.go b/pkg/app/app.go
index f12c0f08a..c6dc12d7b 100644
--- a/pkg/app/app.go
+++ b/pkg/app/app.go
@@ -145,6 +145,11 @@ func isGitVersionValid(versionStr string) bool {
 	return true
 }
 
+func isDirectoryAGitRepository(dir string) (bool, error) {
+	info, err := os.Stat(filepath.Join(dir, ".git"))
+	return info != nil && info.IsDir(), err
+}
+
 func (app *App) setupRepo() (bool, error) {
 	if err := app.validateGitVersion(); err != nil {
 		return false, err
@@ -161,9 +166,8 @@ func (app *App) setupRepo() (bool, error) {
 		if err != nil {
 			return false, err
 		}
-		info, _ := os.Stat(filepath.Join(cwd, ".git"))
-		if info != nil && info.IsDir() {
-			return false, err // Current directory appears to be a git repository.
+		if isRepo, err := isDirectoryAGitRepository(cwd); isRepo {
+			return false, err
 		}
 
 		shouldInitRepo := true
@@ -172,7 +176,7 @@ func (app *App) setupRepo() (bool, error) {
 			// Offer to initialize a new repository in current directory.
 			fmt.Print(app.Tr.CreateRepo)
 			response, _ := bufio.NewReader(os.Stdin).ReadString('\n')
-			if strings.Trim(response, " \n") != "y" {
+			if strings.Trim(response, " \r\n") != "y" {
 				shouldInitRepo = false
 			}
 		} else if notARepository == "skip" {
@@ -181,12 +185,9 @@ func (app *App) setupRepo() (bool, error) {
 
 		if !shouldInitRepo {
 			// check if we have a recent repo we can open
-			recentRepos := app.Config.GetAppState().RecentRepos
-			if len(recentRepos) > 0 {
-				var err error
-				// try opening each repo in turn, in case any have been deleted
-				for _, repoDir := range recentRepos {
-					if err = os.Chdir(repoDir); err == nil {
+			for _, repoDir := range app.Config.GetAppState().RecentRepos {
+				if isRepo, _ := isDirectoryAGitRepository(repoDir); isRepo {
+					if err := os.Chdir(repoDir); err == nil {
 						return true, nil
 					}
 				}
diff --git a/pkg/gui/recent_repos_panel.go b/pkg/gui/recent_repos_panel.go
index dc2f9f17f..22ec04505 100644
--- a/pkg/gui/recent_repos_panel.go
+++ b/pkg/gui/recent_repos_panel.go
@@ -110,6 +110,9 @@ func newRecentReposList(recentRepos []string, currentRepo string) (bool, []strin
 	newRepos := []string{currentRepo}
 	for _, repo := range recentRepos {
 		if repo != currentRepo {
+			if _, err := os.Stat(repo); err != nil {
+				continue
+			}
 			newRepos = append(newRepos, repo)
 		} else {
 			isNew = false