diff --git a/src/insexpand.c b/src/insexpand.c
index de3d519..9df0445 100644
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -4831,7 +4831,8 @@
 
     if ((is_forward && compl_selected_item == compl_match_arraysize - 1)
 	    || (is_backward && compl_selected_item == 0))
-	return compl_first_match != compl_shown_match ? compl_first_match :
+	return compl_first_match != compl_shown_match ?
+	    (is_forward ? compl_shown_match->cp_next : compl_first_match) :
 	    (compl_first_match->cp_prev ? compl_first_match->cp_prev : NULL);
 
     if (is_forward)