diff --git a/source/appModules/code.py b/source/appModules/code.py
index facaeb60a1e..94b2f9bb590 100644
--- a/source/appModules/code.py
+++ b/source/appModules/code.py
@@ -26,10 +26,8 @@ def chooseNVDAObjectOverlayClasses(self, obj, clsList):
 			clsList.insert(0, VSCodeDocument)
 
 	def event_NVDAObject_init(self, obj: NVDAObject):
-		# This is a specific fix for Visual Studio Code,
-		# However, the root cause of the issue is issue #15159.
-		# Once issue #15159 is fixed,
-		# The PR #16248 that introduced this code can be immediately reverted.
-		# (see issue #15159 for full description)
-		if obj.role != controlTypes.Role.EDITABLETEXT:
+		# TODO: This is a specific fix for Visual Studio Code.
+		# Once the underlying issue is resolved, this workaround can be removed.
+		# See issue #15159 for more details.
+		if obj.role != controlTypes.Role.EDITABLETEXT and controlTypes.State.EDITABLE not in obj.states:
 			obj.TextInfo = NVDAObjectTextInfo
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
index e7bbe509074..173a578d598 100644
--- a/user_docs/en/changes.md
+++ b/user_docs/en/changes.md
@@ -84,6 +84,7 @@ In any document, if the cursor is on the last line, it will be moved to the end
 * When the Standard HID Braille Display driver is explicitly selected as the braille display driver, and the braille display list is opened, NVDA correctly identifies the HID driver as the selected driver instead of showing no driver selected. (#17537, @LeonarddeR)
 * The Humanware Brailliant driver is now more reliable in selecting the right connection endpoint, resulting in better connection stability and less errors.  (#17537, @LeonarddeR)
 * Custom braille tables in the developer scratchpad are now properly ignored when running with add-ons disabled. (#17565, @LeonarddeR)
+* Fix issue with certain section elements not being recognized as editable controls in Visual Studio Code. (#17573, @Cary-rowen)
 
 ### Changes for Developers