diff --git a/Misc/NEWS b/Misc/NEWS
index 3940d4d..a9ca312 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,11 @@
 IDLE
 ----
 
+- Bug 778400:  IDLE hangs when selecting "Edit with IDLE" from explorer.
+  This was unique to Windows, and was fixed by adding an -n switch to
+  the command the Windows installer creates to execute "Edit with IDLE"
+  context-menu actions.
+
 - IDLE displays a new message upon startup:  some "personal firewall"
   kinds of programs (for example, ZoneAlarm) open a dialog of their
   own when any program opens a socket.  IDLE does use sockets, talking
diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index b1afad7..5ab12f1 100644
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -2657,25 +2657,25 @@
 item: Edit Registry
   Total Keys=1
   Key=Python.NoConFile\shell\Edit with IDLE\command
-  New Value=%MAINDIR%\pythonw.exe %MAINDIR%\Lib\idlelib\idle.pyw -e "%%1"
+  New Value=%MAINDIR%\pythonw.exe %MAINDIR%\Lib\idlelib\idle.pyw -n -e "%%1"
 end
 item: Edit Registry
   Total Keys=1
   Key=Python.File\shell\Edit with IDLE\command
-  New Value=%MAINDIR%\pythonw.exe %MAINDIR%\Lib\idlelib\idle.pyw -e "%%1"
+  New Value=%MAINDIR%\pythonw.exe %MAINDIR%\Lib\idlelib\idle.pyw -n -e "%%1"
 end
 item: Else Statement
 end
 item: Edit Registry
   Total Keys=1
   Key=Software\CLASSES\Python.NoConFile\shell\Edit with IDLE\command
-  New Value=%MAINDIR%\pythonw.exe %MAINDIR%\Lib\idlelib\idle.pyw -e "%%1"
+  New Value=%MAINDIR%\pythonw.exe %MAINDIR%\Lib\idlelib\idle.pyw -n -e "%%1"
   Root=1
 end
 item: Edit Registry
   Total Keys=1
   Key=Software\CLASSES\Python.File\shell\Edit with IDLE\command
-  New Value=%MAINDIR%\pythonw.exe %MAINDIR%\Lib\idlelib\idle.pyw -e "%%1"
+  New Value=%MAINDIR%\pythonw.exe %MAINDIR%\Lib\idlelib\idle.pyw -n -e "%%1"
   Root=1
 end
 item: End Block