diff --git a/basis/editors/visual-studio-code/visual-studio-code.factor b/basis/editors/visual-studio-code/visual-studio-code.factor
index 0c25699408..d24f9f8fab 100644
--- a/basis/editors/visual-studio-code/visual-studio-code.factor
+++ b/basis/editors/visual-studio-code/visual-studio-code.factor
@@ -1,10 +1,13 @@
 ! Copyright (C) 2015 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays editors io.files io.pathnames kernel make
-math.parser memoize namespaces sequences system tools.which
-vocabs ;
+USING: arrays editors io.files io.pathnames io.standard-paths
+kernel make math.parser memoize namespaces sequences system
+tools.which ;
 IN: editors.visual-studio-code
 
+! Command line arguments
+! https://code.visualstudio.com/docs/editor/codebasics#_additional-command-line-arguments
+
 SINGLETON: visual-studio-code
 visual-studio-code editor-class set-global
 
@@ -17,7 +20,7 @@ MEMO: visual-studio-code-invocation ( -- array )
     ] unless* ;
 
 M: macosx find-visual-studio-code-invocation
-    { "open" "-n" "-b" "com.microsoft.VSCode" "--args" } ;
+    { "open" "-n" "-b" "-r" "com.microsoft.VSCode" "--args" } ;
 
 ERROR: can't-find-visual-studio-code ;
 
@@ -28,10 +31,12 @@ M: linux find-visual-studio-code-invocation
         ] unless
     ] unless* 1array ;
 
+M: windows find-visual-studio-code-invocation
+    { "Microsoft VS Code" } "code.exe" find-in-applications
+    [ 1array ] [ can't-find-visual-studio-code ] if* ;
+
 M: visual-studio-code editor-command ( file line -- command )
     [
-        visual-studio-code-invocation % "-g" ,
+        visual-studio-code-invocation % "-g" , "-r" ,
         number>string ":" glue ,
     ] { } make ;
-
-os windows? [ "editors.visual-studio-code.windows" require ] when
diff --git a/basis/editors/visual-studio-code/windows/platforms.txt b/basis/editors/visual-studio-code/windows/platforms.txt
deleted file mode 100644
index 8e1a55995e..0000000000
--- a/basis/editors/visual-studio-code/windows/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-windows
diff --git a/basis/editors/visual-studio-code/windows/windows.factor b/basis/editors/visual-studio-code/windows/windows.factor
deleted file mode 100644
index 547f43401f..0000000000
--- a/basis/editors/visual-studio-code/windows/windows.factor
+++ /dev/null
@@ -1,11 +0,0 @@
-! Copyright (C) 2015 Doug Coleman.
-! See http://factorcode.org/license.txt for BSD license.
-USING: arrays ascii editors.visual-studio-code
-io.directories.search io.files.temp.windows io.pathnames kernel
-system ;
-IN: editors.visual-studio-code.windows
-
-M: windows find-visual-studio-code-invocation
-    get-appdata-directory f
-    [ file-name >lower "code.exe" = ] find-in-directories
-    [ 1array ] [ f ] if* ;