diff --git a/src/cmdhist.c b/src/cmdhist.c
index 683fc86..d708535 100644
--- a/src/cmdhist.c
+++ b/src/cmdhist.c
@@ -389,7 +389,7 @@
 		i += hislen;
 		wrapped = TRUE;
 	    }
-	if (hist[i].hisnum == num && hist[i].hisstr != NULL)
+	if (i >= 0 && hist[i].hisnum == num && hist[i].hisstr != NULL)
 	    return i;
     }
     else if (-num <= hislen)