1 files changed, 10 insertions, 1 deletions
diff --git a/src/entry_backend/pango.c b/src/entry_backend/pango.c
index c182e4c..41d8301 100644
--- a/src/entry_backend/pango.c
+++ b/src/entry_backend/pango.c
@@ -90,9 +90,18 @@ void entry_backend_pango_update(struct entry *entry)
 		} else if (i >= entry->num_results) {
 			break;
 		}
+		size_t index = i + entry->num_results * entry->page;
+		/*
+		 * We may be on the last page, which could have fewer results
+		 * than expected, so check and break if necessary.
+		 */
+		if (index >= entry->results.count) {
+			break;
+		}
+
 		const char *str;
 		if (i < entry->results.count) {
-			str = entry->results.buf[i].string;
+			str = entry->results.buf[index].string;
 		} else {
 			str = "";
 		}