diff --git a/src/edit.c b/src/edit.c
index 53b43c4..776a420 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -857,8 +857,9 @@
 
 		/* Pressing CTRL-Y selects the current match.  When
 		 * compl_enter_selects is set the Enter key does the same. */
-		if (c == Ctrl_Y || (compl_enter_selects
-				   && (c == CAR || c == K_KENTER || c == NL)))
+		if ((c == Ctrl_Y || (compl_enter_selects
+				    && (c == CAR || c == K_KENTER || c == NL)))
+			&& stop_arrow() == OK)
 		{
 		    ins_compl_delete();
 		    ins_compl_insert(FALSE);