diff --git a/lib/msgstore.go b/lib/msgstore.go
index d9140d7..b91cd82 100644
--- a/lib/msgstore.go
+++ b/lib/msgstore.go
@@ -696,6 +696,7 @@ func (store *MessageStore) NextPrev(delta int) {
 	newIdx := store.FindIndexByUid(uid)
 	if newIdx < 0 {
 		store.Select(uids[len(uids)-1])
+		return
 	}
 
 	newIdx -= delta