diff --git a/.gitignore b/.gitignore
index 48ce5d1..0a00fb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-glew.h
+tests/
 phi-editor
 fmt.sh
 
diff --git a/gui/buffer.go b/gui/buffer.go
index 46ec6e8..c557a8f 100644
--- a/gui/buffer.go
+++ b/gui/buffer.go
@@ -786,7 +786,7 @@ func (b *Buffer) renderAt(ctx *strife.Renderer, rx int, ry int) {
 						if strings.Compare(string(a), subject) == 0 {
 							for i := 0; i < len(subject); i++ {
 								if _, ok := matches[i+idx]; ok {
-									continue
+									break
 								}
 								matches[i+idx] = colours[syntaxIndex]
 							}
diff --git a/gui/close_buffer.go b/gui/close_buffer.go
index 15b7d0e..84156b5 100644
--- a/gui/close_buffer.go
+++ b/gui/close_buffer.go
@@ -48,7 +48,10 @@ func CloseBuffer(b *Buffer) bool {
 		i = i + 1
 		lastBuffer = p.(*Buffer)
 	}
-	lastBuffer.HasFocus = true
+
+	if lastBuffer != nil {
+		lastBuffer.HasFocus = true
+	}
 
 	return true
 }