Fix minor bugs

2 files changed, 4 insertions, 1 deletions

diff --git a/layout.go b/layout.go
index de0cec5..43f4e3c 100644
--- a/layout.go
+++ b/layout.go
@@ -230,7 +230,7 @@ func MoveToItem(dir int, g *gocui.Gui, v *gocui.View) error {
 		}
 	}
 
-	if originalCur == cur {
+	if originalCur == cur && conflict.All[cur].Choice != 0 {
 		globalQuit(g)
 	}
 
diff --git a/main.go b/main.go
index ef373e0..c861474 100644
--- a/main.go
+++ b/main.go
@@ -63,7 +63,10 @@ func parseInput(g *gocui.Gui, v *gocui.View) error {
 		default:
 			PrintPrompt(g, color.Red(color.Regular, "[wasd] >>"))
 			consecutiveError++
+			return
 		}
+		PrintPrompt(g, color.Green(color.Regular, "[wasd] >>"))
+
 		if consecutiveError == 2 {
 			consecutiveError = 0
 			Select(&conflict.All[cur], g, true)