diff --git a/Source/Editor/Modules/SourceCodeEditing/InBuildSourceCodeEditor.cs b/Source/Editor/Modules/SourceCodeEditing/InBuildSourceCodeEditor.cs
index d58e628db..1e42a1604 100644
--- a/Source/Editor/Modules/SourceCodeEditing/InBuildSourceCodeEditor.cs
+++ b/Source/Editor/Modules/SourceCodeEditing/InBuildSourceCodeEditor.cs
@@ -51,6 +51,9 @@ namespace FlaxEditor.Modules.SourceCodeEditing
             case CodeEditorTypes.VS2019:
                 Name = "Visual Studio 2019";
                 break;
+            case CodeEditorTypes.VS2022:
+                Name = "Visual Studio 2022";
+                break;
             case CodeEditorTypes.VSCode:
                 Name = "Visual Studio Code";
                 break;
@@ -106,6 +109,7 @@ namespace FlaxEditor.Modules.SourceCodeEditing
             case CodeEditorTypes.VS2015:
             case CodeEditorTypes.VS2017:
             case CodeEditorTypes.VS2019:
+            case CodeEditorTypes.VS2022:
                 // TODO: finish dynamic files adding to the project
                 //Editor.Instance.ProgressReporting.GenerateScriptsProjectFiles.RunAsync();
                 break;
diff --git a/Source/Editor/Scripting/CodeEditor.h b/Source/Editor/Scripting/CodeEditor.h
index e53215713..ff3e1c986 100644
--- a/Source/Editor/Scripting/CodeEditor.h
+++ b/Source/Editor/Scripting/CodeEditor.h
@@ -57,6 +57,11 @@ API_ENUM(Namespace="FlaxEditor", Attributes="HideInEditor") enum class CodeEdito
     /// </summary>
     VS2019,
 
+    /// <summary>
+    /// Visual Studio 2022
+    /// </summary>
+    VS2022,
+
     /// <summary>
     /// Visual Studio Code
     /// </summary>
diff --git a/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp b/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp
index e8b221a5d..434521b76 100644
--- a/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp
+++ b/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp
@@ -40,6 +40,9 @@ VisualStudioEditor::VisualStudioEditor(VisualStudioVersion version, const String
     case VisualStudioVersion::VS2019:
         _type = CodeEditorTypes::VS2019;
         break;
+    case VisualStudioVersion::VS2022:
+        _type = CodeEditorTypes::VS2022;
+        break;
     default: CRASH;
         break;
     }
@@ -67,6 +70,9 @@ void VisualStudioEditor::FindEditors(Array<CodeEditor*>* output)
         VisualStudioVersion version;
         switch (info.VersionMajor)
         {
+        case 17:
+            version = VisualStudioVersion::VS2022;
+            break;
         case 16:
             version = VisualStudioVersion::VS2019;
             break;
diff --git a/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.h b/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.h
index 183c4dffb..8f8688d83 100644
--- a/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.h
+++ b/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.h
@@ -10,7 +10,7 @@
 /// <summary>
 /// Microsoft Visual Studio version types
 /// </summary>
-DECLARE_ENUM_7(VisualStudioVersion, VS2008, VS2010, VS2012, VS2013, VS2015, VS2017, VS2019);
+DECLARE_ENUM_8(VisualStudioVersion, VS2008, VS2010, VS2012, VS2013, VS2015, VS2017, VS2019, VS2022);
 
 /// <summary>
 /// Implementation of code editor utility that is using Microsoft Visual Studio.
@@ -38,18 +38,15 @@ public:
 public:
 
     /// <summary>
-    /// Gets version of Visual Studio
+    /// Gets version of Visual Studio.
     /// </summary>
-    /// <returns>VS version</returns>
     FORCE_INLINE VisualStudioVersion GetVersion() const
     {
         return _version;
     }
 
-public:
-
     /// <summary>
-    /// Try to find installed Visual Studio instances. Adds them to the result list.
+    /// Tries to find installed Visual Studio instances and dds them to the result list.
     /// </summary>
     /// <param name="output">The output editors.</param>
     static void FindEditors(Array<CodeEditor*>* output);