diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index bd9829ea3..1e3f7b82f 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -128,6 +128,7 @@ public class Editor extends JFrame implements RunnerListener {
 
   boolean running;
   boolean presenting;
+  boolean uploading;
 
   // undo fellers
   JMenuItem undoItem, redoItem;
@@ -2158,6 +2159,8 @@ public class Editor extends JFrame implements RunnerListener {
           try {
             serialMonitor.closeSerialPort();
             serialMonitor.setVisible(false);
+            
+            uploading = true;
           
             boolean success = sketch.exportApplet(new Target(
               Base.getHardwarePath() + File.separator + "cores",
@@ -2174,6 +2177,7 @@ public class Editor extends JFrame implements RunnerListener {
           } catch (Exception e) {
             e.printStackTrace();
           }
+          uploading = false;
           //toolbar.clear();
           toolbar.deactivate(EditorToolbar.EXPORT);
         }});
@@ -2217,6 +2221,7 @@ public class Editor extends JFrame implements RunnerListener {
   
   
   public void handleSerial() {
+    if (uploading) return;
     serialMonitor.setVisible(true);
     serialMonitor.openSerialPort();
   }
diff --git a/todo.txt b/todo.txt
index e0f125c09..b2ec29aa7 100644
--- a/todo.txt
+++ b/todo.txt
@@ -3,18 +3,24 @@
 
 PROCESSING 5503 SYNC
 
+Get rid of unused preferences in the preferences dialog.
+
 Add library keyword highlighting.
 
-Allow closing of the serial monitor with keyboard short cuts.
+Fix document icon on Windows.
+
+Don't allow in-place modification of user-installed library examples.
+
+Escape characters with copy as html.
+
+Enable verbose output if shift (or alt?) is held down when pressing run or upload.
+
+Add keyboard shortcut for opening the serial monitor.
 
 Clear serial monitor button when the serial monitor opens.
 
 Support libraries in the SKETCH/code folder?
 
-Get rid of unused preferences in the preferences dialog.
-
-Don't allow in-place modification of user-installed library examples.
-
 Test the FTDI drivers in the arduino.dmg.
 
 Test bootloader burning w/ an AVRISP and a parallel programmer.