diff --git a/src/segment_git.go b/src/segment_git.go
index 733f4566..f3c0dff6 100644
--- a/src/segment_git.go
+++ b/src/segment_git.go
@@ -227,6 +227,11 @@ func (g *git) setGitStatus() {
 		if len(status) <= 4 {
 			return
 		}
+		const UNTRACKED = "?"
+		if strings.HasPrefix(status, UNTRACKED) {
+			g.Working.add(UNTRACKED)
+			return
+		}
 		workingCode := status[3:4]
 		stagingCode := status[2:3]
 		g.Working.add(workingCode)