diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
index 1526fb626..1192737fa 100644
--- a/RELEASE_NOTES.rst
+++ b/RELEASE_NOTES.rst
@@ -15,11 +15,21 @@ unreleased [2.x]
     patterns = pyon.load_file("influxdb_patterns.pyon")
     for p in patterns:
         print(p)
+
 * The "GUI" has been renamed the "dashboard".
 * When flashing NIST boards, use "-m nist_qcX" or "-m nist_clock" instead of
   just "-m qcX" or "-m clock" (#290).
 * Applet command lines now use templates (e.g. $python) instead of formats
   (e.g. {python}).
+* On Windows, GUI applications no longer open a console. For debugging
+  purposes, the console messages can still be displayed by running the GUI
+  applications this way::
+
+    python3.5 -m artiq.frontend.artiq_browser
+    python3.5 -m artiq.frontend.artiq_dashboard
+
+  (you may need to replace python3.5 with python)
+  Please always include the console output when reporting a GUI crash.
 
 
 unreleased [1.0rc3]
diff --git a/setup.py b/setup.py
index d70006c54..4482cbc50 100755
--- a/setup.py
+++ b/setup.py
@@ -19,15 +19,13 @@ requirements = [
     "lit", "OutputCheck",
 ]
 
-scripts = [
-    "artiq_browser=artiq.frontend.artiq_browser:main",
+console_scripts = [
     "artiq_client=artiq.frontend.artiq_client:main",
     "artiq_compile=artiq.frontend.artiq_compile:main",
     "artiq_coreanalyzer=artiq.frontend.artiq_coreanalyzer:main",
     "artiq_coreconfig=artiq.frontend.artiq_coreconfig:main",
     "artiq_corelog=artiq.frontend.artiq_corelog:main",
     "artiq_ctlmgr=artiq.frontend.artiq_ctlmgr:main",
-    "artiq_dashboard=artiq.frontend.artiq_dashboard:main",
     "artiq_influxdb=artiq.frontend.artiq_influxdb:main",
     "artiq_master=artiq.frontend.artiq_master:main",
     "artiq_mkfs=artiq.frontend.artiq_mkfs:main",
@@ -41,6 +39,11 @@ scripts = [
     "thorlabs_tcube_controller=artiq.frontend.thorlabs_tcube_controller:main",
 ]
 
+gui_scripts = [
+    "artiq_browser=artiq.frontend.artiq_browser:main",
+    "artiq_dashboard=artiq.frontend.artiq_dashboard:main",
+]
+
 setup(
     name="artiq",
     version=versioneer.get_version(),
@@ -62,6 +65,7 @@ setup(
     include_package_data=True,
     ext_modules=[],
     entry_points={
-        "console_scripts": scripts,
+        "console_scripts": console_scripts,
+        "gui_scripts": gui_scripts,
     }
 )