diff --git a/ISHelp/isetup.xml b/ISHelp/isetup.xml
index d3226eeb1..c8c2a1b62 100644
--- a/ISHelp/isetup.xml
+++ b/ISHelp/isetup.xml
@@ -3188,12 +3188,6 @@ Filename: "{win}\MYPROG.INI"; Section: "InstallSettings"; Key: "InstallPath"; St
 <tr>
   <td>Go to next word. Shift extends selection.</td><td>Ctrl+Right</td>
 </tr>
-<tr>
-  <td>Go to previous word part. Shift extends selection.</td><td>Ctrl+/</td>
-</tr>
-<tr>
-  <td>Go to next word part. Shift extends selection.</td><td>Ctrl+\</td>
-</tr>
 <tr>
   <td>Scroll up.</td><td>Ctrl+Up</td>
 </tr>
diff --git a/Projects/Src/CompScintEdit.pas b/Projects/Src/CompScintEdit.pas
index 81a732e5d..8caf52c94 100644
--- a/Projects/Src/CompScintEdit.pas
+++ b/Projects/Src/CompScintEdit.pas
@@ -341,6 +341,8 @@ procedure TCompScintEdit.SetKeyMappingType(
       AssignCmdKey(SCK_DOWN, [ssAlt], SCI_MOVESELECTEDLINESDOWN);
     end;
     Call(SCI_SETMOUSEMAPPING, Ord(FKeyMappingType = kmtVSCode), 0);
+    ClearCmdKey('/', [ssCtrl]);
+    ClearCmdKey('\', [ssCtrl]);
     UpdateComplexCommands;
   end;
 end;
@@ -350,6 +352,9 @@ procedure TCompScintEdit.UpdateComplexCommands;
   FComplexCommands.Clear;
   FComplexCommandsReversed.Clear;
 
+  { VK_OEM_1 is ;, VK_OEM_6 is ], VK_OEM_4 is [, VK_OEM_2 is /
+    See https://code.visualstudio.com/docs/getstarted/keybindings#_keyboard-layouts }
+
   if FKeyMappingType = kmtVSCode then begin
     { Use freed Ctrl+D and Ctrl+Shift+L }
     AddComplexCommand(ShortCut(KeyToKeyCode('D'), [ssCtrl]), ccSelectNextOccurrence);
@@ -364,6 +369,7 @@ procedure TCompScintEdit.UpdateComplexCommands;
   AddComplexCommand(ShortCut(VK_ESCAPE, []), ccSimplifySelection);
   AddComplexCommand(ShortCut(VK_OEM_6, [ssShift, ssCtrl]), ccUnfoldLine);
   AddComplexCommand(ShortCut(VK_OEM_4, [ssShift, ssCtrl]), ccFoldLine);
+  { Use freed Ctrl+/ }
   AddComplexCommand(ShortCut(VK_OEM_2, [ssCtrl]), ccToggleLinesComment);
 end;