diff --git a/COPYRIGHT b/COPYRIGHT
index 95b7de7db..9cc9d6264 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -25,6 +25,7 @@ ksh 93u+m general copyright notice
 #                  George Lijo <george.lijo@gmail.com>                 #
 #                 Govind Kamat <govind_kamat@yahoo.com>                #
 #                 Harald van Dijk <harald@gigawatt.nl>                 #
+#               K. Eugene Carlson <kvngncrlsn@gmail.com>               #
 #                  Kurtis Rader <krader@skepticism.us>                 #
 #                   Lev Kujawski <int21h@mailbox.org>                  #
 #                   Marc Wilson <posguy99@gmail.com>                   #
diff --git a/NEWS b/NEWS
index bbe407ffa..f5dc04796 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,10 @@ Any uppercase BUG_* names are modernish shell bug IDs.
 - Fixed a bug introduced on 2022-02-08 where $PPID was incorrect when a script
   without a #! path was executed.
 
+- Fixed a completion bug in the vi line editor. It now correctly completes
+  the sole member of a directory when tab is pressed immediately after /.
+  Thanks to K. Eugene Carlson for the report and the fix.
+
 2022-07-26:
 
 - Fixed incorrect handling of initial zeros in test/[ and [[ arithmetic
diff --git a/src/cmd/ksh93/edit/vi.c b/src/cmd/ksh93/edit/vi.c
index d2335b2e9..53f74f9b2 100644
--- a/src/cmd/ksh93/edit/vi.c
+++ b/src/cmd/ksh93/edit/vi.c
@@ -2566,7 +2566,7 @@ addin:
 			last_virt = i;
 			ed_ringbell();
 		}
-		else if((c=='=' || (c=='\\'&&virtual[last_virt]=='/')) && !vp->repeat_set)
+		else if(vp->ed->e_nlist!=0 && !vp->repeat_set)
 		{
 			last_virt = i;
 			vi_redraw((void*)vp);