diff --git a/cmdbuf.c b/cmdbuf.c
index 16ba9d43..460b90a6 100644
--- a/cmdbuf.c
+++ b/cmdbuf.c
@@ -861,9 +861,10 @@ cmd_edit(c)
 		flags |= ECF_NOHISTORY;
 #endif
 #if TAB_COMPLETE_FILENAME
-	if (curr_mlist == ml_search)
+	if (curr_mlist == ml_search || curr_mlist == NULL)
 		/*
-		 * In a search command; don't accept file-completion cmds.
+		 * Don't accept file-completion cmds in contexts 
+		 * such as search pattern, digits, long option name, etc.
 		 */
 		flags |= ECF_NOCOMPLETE;
 #endif
diff --git a/forwback.c b/forwback.c
index 6d809a63..b04ea227 100644
--- a/forwback.c
+++ b/forwback.c
@@ -399,7 +399,7 @@ forw(n, pos, force, only_last, nblank)
 	else
 	{
 		overlay_header();
-		lower_left();
+		/* lower_left(); {{ considered harmful? }} */
 	}
 	first_time = 0;
 	(void) currline(BOTTOM);
diff --git a/lesskey.nro.VER b/lesskey.nro.VER
index 8c22a418..f614eabf 100644
--- a/lesskey.nro.VER
+++ b/lesskey.nro.VER
@@ -1,7 +1,7 @@
 '\" t
 .TH LESSKEY 1 "Version @@VERSION@@: @@DATE@@"
 .SH NAME
-lesskey \- specify key bindings for less
+lesskey \- customize key bindings for less
 .SH "SYNOPSIS (deprecated)"
 .B "lesskey [\-o output] [\-\-] [input]"
 .br
@@ -42,9 +42,9 @@ The input file consists of one or more
 Each section starts with a line that identifies the type of section.
 Possible sections are:
 .IP #command
-Defines new command keys.
+Customizes command key bindings.
 .IP #line-edit
-Defines new line-editing keys.
+Customizes line-editing key bindings.
 .IP #env
 Defines environment variables.
 .PP