README.md               | 2 +-
 doc/lsp.txt             | 4 ++--
 test/tsserver_tests.vim | 2 ++

diff --git a/README.md b/README.md
index dd918d06e532b62b62cc9cc91e918ce9756c73b0..c7d8aaea4eeaf31f8fcdf40d98e9f0c55c16d986 100644
--- a/README.md
+++ b/README.md
@@ -149,12 +149,12 @@ -------|-----------
 :LspCodeAction|Apply the code action supplied by the language server to the diagnostic in the current line.
 :LspDiagCurrent|Display the diagnostic message for the current line
 :LspDiagFirst|Jump to the first diagnostic message for the current buffer
+:LspDiagHere|Jump to the next diagnostic message in the current line
 :LspDiagHighlightDisable|Disable diagnostic message highlights
 :LspDiagHighlightEnable|Enable diagnostic message highlights
 :LspDiagNext|Jump to the next diagnostic message after the current position
 :LspDiagPrev|Jump to the previous diagnostic message before the current position
 :LspDiagShow|Display the diagnostics messages from the language server for the current buffer in a new location list.
-:LspDiagHere|Jump to the current diagnostic message in the current line
 :LspFold|Fold the current file
 :LspFormat|Format a range of lines in the current file using the language server. The **shiftwidth** and **expandtab** values set for the current buffer are used when format is applied.  The default range is the entire file.
 :LspGotoDeclaration|Go to the declaration of the keyword under cursor
diff --git a/doc/lsp.txt b/doc/lsp.txt
index 93f2b389690159bfa5e2025f7583a2ed9ae56e8b..88826b916b0bec9f8fc7af69b01de907ee4f4f63 100644
--- a/doc/lsp.txt
+++ b/doc/lsp.txt
@@ -73,6 +73,8 @@ 			to the diagnostic in the current line.
 :LspDiagCurrent		Display the diagnostic message for the current line.
 :LspDiagFirst		Jump to the first diagnostic message for the current
 			buffer.
+:LspDiagHere		Jump to the next diagnostic message in the current
+			line.
 :LspDiagHighlightDisable
 			Disable highlighting lines with a diagnostic message
 			for the current Vim session.
@@ -84,8 +86,6 @@ :LspDiagPrev		Jump to the previous diagnostic message for the current
 			buffer before the current current position.
 :LspDiagShow		Display the diagnostics messages from the language
 			server for the current buffer in a location list.
-:LspDiagHere		Jump to the current diagnostic message for the current
-			buffer in the current line (start from current column).
 :LspFold		Fold the current file
 :LspFormat		Format a range of lines in the current file using the
 			language server.  The default range is the entire file.
diff --git a/test/tsserver_tests.vim b/test/tsserver_tests.vim
index ee766191f252a4246a7115d2e7da2d468abf9615..8f00daee55d6a83eb555ccfb9cb1033b9f968c1f 100644
--- a/test/tsserver_tests.vim
+++ b/test/tsserver_tests.vim
@@ -62,8 +62,10 @@
   :normal! 0
   :LspDiagHere
   assert_equal([1, 3], [line('.'), col('.')])
+  :normal! l
   :LspDiagHere
   assert_equal([1, 10], [line('.'), col('.')])
+  popup_clear()
 
   g:LspOptionsSet({showDiagInPopup: false})
   for i in range(1, 3)