diff --git a/build/tasks/src/org/jetbrains/intellij/build/tasks/keymapPlugin.kt b/build/tasks/src/org/jetbrains/intellij/build/tasks/keymapPlugin.kt
index 067fde8a49af..b582104959e4 100644
--- a/build/tasks/src/org/jetbrains/intellij/build/tasks/keymapPlugin.kt
+++ b/build/tasks/src/org/jetbrains/intellij/build/tasks/keymapPlugin.kt
@@ -28,6 +28,7 @@ fun buildKeymapPlugins(buildNumber: String, targetDir: Path, keymapDir: Path): F
       arrayOf("ReSharper", "ReSharper OSX"),
       arrayOf("Sublime Text", "Sublime Text (Mac OS X)"),
       arrayOf("Visual Studio", "Visual Studio OSX"),
+      arrayOf("Visual Studio 2022"),
       arrayOf("Visual Assist", "Visual Assist OSX"),
       arrayOf("VSCode", "VSCode OSX"),
       arrayOf("Visual Studio for Mac"),
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.kt b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.kt
index 9b6d699c8377..220a229a1af8 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.kt
@@ -667,6 +667,7 @@ private fun areShortcutsEqual(shortcuts1: List<Shortcut>, shortcuts2: List<Short
 @Suppress("SpellCheckingInspection") private const val resharperKeymap = "com.intellij.plugins.resharperkeymap"
 @Suppress("SpellCheckingInspection") private const val sublimeKeymap = "com.intellij.plugins.sublimetextkeymap"
 @Suppress("SpellCheckingInspection") private const val visualStudioKeymap = "com.intellij.plugins.visualstudiokeymap"
+@Suppress("SpellCheckingInspection") private const val visualStudio2022Keymap = "com.intellij.plugins.visualstudio2022keymap"
 @Suppress("SpellCheckingInspection") private const val xcodeKeymap = "com.intellij.plugins.xcodekeymap"
 @Suppress("SpellCheckingInspection") private const val visualAssistKeymap = "com.intellij.plugins.visualassistkeymap"
 @Suppress("SpellCheckingInspection") private const val riderKeymap = "com.intellij.plugins.riderkeymap"
@@ -699,6 +700,7 @@ internal fun notifyAboutMissingKeymap(keymapName: String, @NlsContexts.Notificat
             "Sublime Text (Mac OS X)" -> sublimeKeymap
             "Visual Studio",
             "Visual Studio OSX" -> visualStudioKeymap
+            "Visual Studio 2022" -> visualStudio2022Keymap
             "Visual Assist",
             "Visual Assist OSX" -> visualAssistKeymap
             "Xcode" -> xcodeKeymap
@@ -741,6 +743,8 @@ internal fun notifyAboutMissingKeymap(keymapName: String, @NlsContexts.Notificat
                 when (pluginId) {
                   gnomeKeymap, kdeKeymap -> plugins += PluginId.getId(xwinKeymap)
                   resharperKeymap -> plugins += PluginId.getId(visualStudioKeymap)
+                  visualAssistKeymap -> plugins += PluginId.getId(visualStudioKeymap)
+                  visualStudio2022Keymap -> plugins += PluginId.getId(visualStudioKeymap)
                   xcodeKeymap, vsForMacKeymap -> plugins += PluginId.getId(macOSKeymap)
                 }
                 installAndEnable(project, plugins) { }
diff --git a/platform/platform-resources/src/keymaps/Visual Studio 2022.xml b/platform/platform-resources/src/keymaps/Visual Studio 2022.xml
new file mode 100644
index 000000000000..d0fd8dc58e6c
--- /dev/null
+++ b/platform/platform-resources/src/keymaps/Visual Studio 2022.xml	
@@ -0,0 +1,227 @@
+<keymap name="Visual Studio 2022" parent="Visual Studio" version="1" disable-mnemonics="false">
+  <action id="EditorCompleteStatement"/>
+  <action id="EditorStartNewLine">
+    <keyboard-shortcut first-keystroke="control shift ENTER"/><!--Edit.LineOpenBelow-->
+  </action>
+  <action id="MethodUp"/>
+  <action id="MoveLineUp">
+    <keyboard-shortcut first-keystroke="alt UP"/><!--Edit.MoveSelectedLinesUp-->
+  </action>
+  <action id="MethodDown"/>
+  <action id="MoveLineDown">
+    <keyboard-shortcut first-keystroke="alt DOWN"/><!--Edit.MoveSelectedLinesDown-->
+  </action>
+  <action id="CodeCompletion">
+    <keyboard-shortcut first-keystroke="control SPACE"/>
+    <keyboard-shortcut first-keystroke="control J"/>
+    <keyboard-shortcut first-keystroke="alt Right"/><!--Edit.CompleteWord-->
+  </action>
+  <action id="RecentFiles"/>
+  <action id="SearchEverywhere">
+    <keyboard-shortcut first-keystroke="control T"/>
+    <keyboard-shortcut first-keystroke="control COMMA"/><!--Edit.GoToAll-->
+  </action>
+  <action id="Vcs.QuickListPopupAction"/>
+  <action id="EvaluateExpression">
+    <keyboard-shortcut first-keystroke="control alt Q"/><!--Debug.QuickWatch-->
+    <keyboard-shortcut first-keystroke="shift F9"/>
+  </action>
+  <action id="IntroduceVariable"/>
+  <action id="Move"/>
+  <action id="ChangeSignature">
+    <keyboard-shortcut first-keystroke="control R" second-keystroke="V"/><!--Refactor.RemoveParameters-->
+    <keyboard-shortcut first-keystroke="control R" second-keystroke="control V"/>
+    <keyboard-shortcut first-keystroke="control R" second-keystroke="O"/><!--Refactor.ReorderParameters-->
+    <keyboard-shortcut first-keystroke="control R" second-keystroke="control O"/>
+  </action>
+  <action id="Inline"/>
+  <action id="ExtractInterface">
+    <keyboard-shortcut first-keystroke="control R" second-keystroke="I"/><!--Refactor.ExtractInterface-->
+    <keyboard-shortcut first-keystroke="control R" second-keystroke="control I"/>
+  </action>
+  <action id="FindNext">
+    <keyboard-shortcut first-keystroke="F3"/><!--Edit.FindNext-->
+    <keyboard-shortcut first-keystroke="control shift DOWN"/><!--Edit.NextHighlightedReference-->
+    <keyboard-shortcut first-keystroke="alt shift SLASH"/><!--Edit.MoveLastCaretDown-->
+  </action>
+  <action id="FindPrevious">
+    <keyboard-shortcut first-keystroke="shift F3"/><!--Edit.FindPrevious-->
+    <keyboard-shortcut first-keystroke="control shift UP"/><!--Edit.PreviousHighlightedReference-->
+  </action>
+  <action id="NextTab">
+    <keyboard-shortcut first-keystroke="control alt PAGE_DOWN"/><!--Window.NextTab-->
+  </action>
+  <action id="PreviousTab">
+    <keyboard-shortcut first-keystroke="control alt PAGE_UP"/><!--Window.PreviousTab-->
+  </action>
+  <action id="NextOccurence">
+    <keyboard-shortcut first-keystroke="F8"/><!--Edit.GoToNextLocation-->
+  </action>
+  <action id="PreviousOccurence">
+    <keyboard-shortcut first-keystroke="shift F8"/><!--Edit.GoToPrevLocation-->
+  </action>
+  <action id="RenameElement">
+    <keyboard-shortcut first-keystroke="control R" second-keystroke="R"/>
+    <keyboard-shortcut first-keystroke="control R" second-keystroke="control R"/>
+    <keyboard-shortcut first-keystroke="F2"/><!--File.Rename-->
+  </action>
+  <action id="GotoAction">
+    <keyboard-shortcut second-keystroke="control Q"/><!--Window.QuickLaunch-->
+  </action>
+  <action id="NewElementSamePlace">
+    <keyboard-shortcut first-keystroke="control shift A"/><!--Project.AddNewItem-->
+  </action>
+  <action id="ActivateProblemsViewToolWindow">
+    <keyboard-shortcut first-keystroke="alt 6" />
+    <keyboard-shortcut first-keystroke="control back_slash" second-keystroke="E" /><!--View.ErrorList-->
+    <keyboard-shortcut first-keystroke="control back_slash" second-keystroke="control E" />
+  </action>
+  <action id="ForceStepInto"/>
+  <action id="InspectCode">
+    <keyboard-shortcut first-keystroke="alt F11"/><!--Build.RunCodeAnalysisonSolution-->
+  </action>
+  <action id="FindUsagesInFile"/>
+  <action id="HighlightUsagesInFile"/>
+  <action id="SmartStepInto">
+    <keyboard-shortcut first-keystroke="alt shift F11"/><!--Debug.StepIntoSpecific-->
+  </action>
+  <action id="AutoIndentLines" />
+  <action id="CallHierarchy">
+    <keyboard-shortcut first-keystroke="control K" second-keystroke="T"/><!--EditorContextMenus.CodeWindow.ViewCallHierarchy-->
+    <keyboard-shortcut first-keystroke="control K" second-keystroke="control T"/>
+  </action>
+  <action id="ContextHelp">
+    <keyboard-shortcut first-keystroke="F1"/><!--Help.F1Help-->
+    <keyboard-shortcut first-keystroke="Shift F1"/><!--Help.WindowHelp-->
+  </action>
+  <action id="GotoBookmark0"/>
+  <action id="ActivateCommitToolWindow">
+    <keyboard-shortcut first-keystroke="control 0" second-keystroke="G"/><!--Team.Git.GoToGitChanges-->
+    <keyboard-shortcut first-keystroke="control 0" second-keystroke="control G"/>
+  </action>
+  <action id="ActivateVersionControlToolWindow">
+    <keyboard-shortcut first-keystroke="alt 9" />
+    <keyboard-shortcut first-keystroke="control 0" second-keystroke="S" /><!--View.GitRepositoryWindow-->
+    <keyboard-shortcut first-keystroke="control 0" second-keystroke="control S" />
+  </action>
+  <action id="Unscramble">
+    <keyboard-shortcut first-keystroke="control E" second-keystroke="control T" />
+  </action>
+  <action id="Unscramble">
+    <keyboard-shortcut first-keystroke="control E" second-keystroke="control T" />
+  </action>
+  <action id="CheckinProject" />
+  <action id="ActivateHierarchyToolWindow">
+    <keyboard-shortcut first-keystroke="control alt K" /><!--View.CallHierarchy-->
+  </action>
+  <action id="ActivateDatabaseToolWindow">
+    <keyboard-shortcut first-keystroke="control back_slash" second-keystroke="S" /><!--View.SQLServerObjectExplorer-->
+    <keyboard-shortcut first-keystroke="control back_slash" second-keystroke="control S" />
+  </action>
+  <action id="ActivateStructureToolWindow">
+    <keyboard-shortcut first-keystroke="control alt T" /><!--View.DocumentOutline-->
+  </action>
+  <action id="ShowBookmarks" />
+  <action id="ActivateTerminalToolWindow">
+    <keyboard-shortcut first-keystroke="control BACK_QUOTE"/><!--View.Terminal-->
+  </action>
+  <action id="ActivateBookmarksToolWindow">
+    <keyboard-shortcut first-keystroke="alt 2" />
+    <keyboard-shortcut first-keystroke="control K" second-keystroke="W" /><!--View.BookmarkWindow-->
+    <keyboard-shortcut first-keystroke="control K" second-keystroke="control W" />
+  </action>
+  <action id="HideAllWindows" />
+  <action id="ActivateTODOToolWindow">
+    <keyboard-shortcut first-keystroke="control back_slash" second-keystroke="T" /><!--View.TaskList-->
+    <keyboard-shortcut first-keystroke="control back_slash" second-keystroke="control T" />
+  </action>
+  <action id="CollapseBlock" />
+  <action id="EditorIncreaseFontSize">
+    <keyboard-shortcut first-keystroke="control shift PERIOD" /><!--View.ZoomIn-->
+  </action>
+  <action id="RecentChangedFiles" />
+  <action id="EditorDecreaseFontSize">
+    <keyboard-shortcut first-keystroke="control shift COMMA" /><!--View.ZoomOut-->
+  </action>
+  <action id="Diff.FocusOppositePane">
+    <keyboard-shortcut first-keystroke="control back_slash" second-keystroke="control tab" /><!--Diff.SwitchBetweenLeftAndRight-->
+    <keyboard-shortcut first-keystroke="control back_slash" second-keystroke="tab" />
+    <keyboard-shortcut first-keystroke="control shift tab" />
+  </action>
+  <action id="NextDiff">
+    <keyboard-shortcut first-keystroke="F8" /><!--Diff.NextDifference-->
+    <keyboard-shortcut first-keystroke="F7" />
+  </action>
+  <action id="PreviousDiff">
+    <keyboard-shortcut first-keystroke="shift F8" /><!--Diff.PreviousDifference-->
+    <keyboard-shortcut first-keystroke="shift F7" />
+  </action>
+  <action id="CollapseSelection">
+    <keyboard-shortcut first-keystroke="control M" second-keystroke="H"/><!--Edit.HideSelection-->
+    <keyboard-shortcut first-keystroke="control M" second-keystroke="control H"/>
+    <keyboard-shortcut first-keystroke="control M" second-keystroke="U"/><!--Edit.StopHidingCurrent-->
+    <keyboard-shortcut first-keystroke="control M" second-keystroke="control U"/>
+  </action>
+
+  <!--Rider-specific actions-->
+  <action id="Rider.Plugins.FSharp.SendToFsi" />
+  <action id="com.jetbrains.rider.interactive.csi.SendToCSharpInteractive" />
+  <action id="BuildCurrentProject">
+    <keyboard-shortcut first-keystroke="control B"/><!--Build.BuildSelection-->
+  </action>
+  <action id="RiderShowIlViewerAction">
+    <keyboard-shortcut first-keystroke="control alt D" /><!--Debug.Disassembly-->
+  </action>
+  <action id="ActivateUnitTestsToolWindow">
+    <keyboard-shortcut first-keystroke="alt 8" />
+    <keyboard-shortcut first-keystroke="shift alt 8" />
+    <keyboard-shortcut first-keystroke="control E" second-keystroke="T" /><!--TestExplorer.ShowTestExplorer-->
+  </action>
+  <action id="RiderUnitTestRunContextSplitAction">
+    <keyboard-shortcut first-keystroke="control R" second-keystroke="T" /><!--TestExplorer.RunAllTestsInContext-->
+  </action>
+  <action id="RiderUnitTestRunSolutionAction">
+    <keyboard-shortcut first-keystroke="control U" second-keystroke="L" />
+    <keyboard-shortcut first-keystroke="control U" second-keystroke="control L" />
+    <keyboard-shortcut first-keystroke="control R" second-keystroke="A" /><!--TestExplorer.RunAllTests-->
+  </action>
+  <action id="RiderUnitTestRepeatPreviousRunAction">
+    <keyboard-shortcut first-keystroke="control U" second-keystroke="U" />
+    <keyboard-shortcut first-keystroke="control U" second-keystroke="control U" />
+    <keyboard-shortcut first-keystroke="control R" second-keystroke="L" /><!--TestExplorer.RepeatLastRun-->
+  </action>
+  <action id="Rider.Plugins.FSharp.StartFsi">
+    <keyboard-shortcut first-keystroke="control alt F" /><!--View.F#Interactive-->
+  </action>
+  <action id="ReSharperGotoNextErrorInSolution">
+    <keyboard-shortcut first-keystroke="shift alt page_down" />
+    <keyboard-shortcut first-keystroke="control shift F12" /><!--View.NextError-->
+  </action>
+  <action id="ReSharperSelectContainingDeclaration">
+    <keyboard-shortcut first-keystroke="shift alt close_bracket" /><!--Edit.ExpandSelectiontoContainingBlock-->
+    <keyboard-shortcut first-keystroke="control shift open_bracket" />
+  </action>
+  <action id="RiderCodeLens.ShowMore">
+    <keyboard-shortcut first-keystroke="control K" second-keystroke="control back_quote" /><!--Edit.ShowCodeLensMenu-->
+    <keyboard-shortcut first-keystroke="control K" second-keystroke="back_quote" />
+  </action>
+
+
+  <!--MISSING VISUAL STUDIO SHORTCUTS-->
+
+  <!--Solution explorer search	Ctrl+;	Window.SolutionExplorerSearch-->
+  <!--Alt-F6	                 Moves to the next tool window. No such action in platform-->
+  <!--Ctrl+F6, Ctrl-Shift-F6   Moves to the next/previous editor tab, but it's not clear what is considered next and previous-->
+  <!--Shift+F6                 Moves to the previous pane of a document in split pane view-->
+  <!--Ctrl+Shift+F3              Edit.FindPreviousSelected               https://youtrack.jetbrains.com/issue/RIDER-61910-->
+  <!--Stop outlining	Ctrl+M, Ctrl+P	Edit.StopOutlining-->
+
+  <!--Not clear, how these actions should work-->
+  <!--Compile	Ctrl+F7	Build.Compile-->
+  <!--Run code analysis on solution	Alt+F11	Build.RunCodeAnalysisonSolution-->
+  <!--Break at function	Ctrl+B	Debug.BreakatFunction-->
+  <!--Break all	Ctrl+Alt+Break	Debug.BreakAll-->
+
+
+
+</keymap>
diff --git a/platform/platform-resources/src/keymaps/Visual Studio.xml b/platform/platform-resources/src/keymaps/Visual Studio.xml
index 27ea50a32547..334e6ce835dd 100644
--- a/platform/platform-resources/src/keymaps/Visual Studio.xml	
+++ b/platform/platform-resources/src/keymaps/Visual Studio.xml	
@@ -274,6 +274,8 @@
   <action id="SurroundWithLiveTemplate">
     <keyboard-shortcut first-keystroke="control E" second-keystroke="U"/>
     <keyboard-shortcut first-keystroke="control E" second-keystroke="control U"/>
+    <keyboard-shortcut first-keystroke="control K" second-keystroke="S"/><!--Edit.SurroundWith-->
+    <keyboard-shortcut first-keystroke="control K" second-keystroke="control S"/>
   </action>
   <action id="Vcs.ShowMessageHistory">
     <keyboard-shortcut first-keystroke="control H"/>