diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java
index 84c46c22a..d6b1a4fe4 100644
--- a/app/src/processing/app/Sketch.java
+++ b/app/src/processing/app/Sketch.java
@@ -427,6 +427,16 @@ public class Sketch {
                            "\"" + newName + "\" already exists.", null);
           return;
         }
+        
+        // renaming the containing sketch folder
+        boolean success = folder.renameTo(newFolder);
+        if (!success) {
+          Base.showWarning("Error", "Could not rename the sketch folder.", null);
+          return;
+        }
+        // let this guy know where he's living (at least for a split second)
+        current.setFolder(newFolder);
+        // folder will be set to newFolder by updateInternal()
 
         // unfortunately this can't be a "save as" because that
         // only copies the sketch files and the data folder
@@ -438,6 +448,8 @@ public class Sketch {
 //          return;
 //        }
 
+        // This isn't changing folders, just changes the name
+        newFile = new File(newFolder, newName);
         if (!current.renameTo(newFile, newExtension)) {
           Base.showWarning("Error",
                            "Could not rename \"" + current.getFileName() +
@@ -445,24 +457,6 @@ public class Sketch {
           return;
         }
 
-        // save each of the other tabs because this is gonna be re-opened
-//        try {
-//          for (int i = 1; i < codeCount; i++) {
-//            code[i].save();
-//          }
-//        } catch (Exception e) {
-//          Base.showWarning("Error", "Could not rename the sketch. (1)", e);
-//          return;
-//        }
-
-        // now rename the sketch folder and re-open
-        boolean success = folder.renameTo(newFolder);
-        if (!success) {
-          Base.showWarning("Error", "Could not rename the sketch folder.", null);
-          return;
-        }
-        // if successful, set base properties for the sketch
-
         // Tell each code file the good news about their new home.
         // current.renameTo() above already took care of the main tab.
         for (int i = 1; i < codeCount; i++) {
@@ -496,7 +490,7 @@ public class Sketch {
         }
       }
 
-    } else {  // creating a new file
+    } else {  // not renaming, creating a new file
       try {
         if (!newFile.createNewFile()) {
           // Already checking for IOException, so make our own.
@@ -870,7 +864,7 @@ public class Sketch {
     // reset all the state information for the sketch object 
     primaryFile = code[0].getFile();
     name = sketchName;
-    folder = sketchFolder;    
+    folder = sketchFolder;
     codeFolder = new File(folder, "code");
     dataFolder = new File(folder, "data");
     
@@ -879,9 +873,11 @@ public class Sketch {
     // nah, this might just annoy people
 
     // Name changed, rebuild the sketch menus
+    calcModified();
+//    System.out.println("modified is now " + modified);
     editor.setTitle();
     editor.base.rebuildSketchbookMenus();
-    editor.header.rebuild();
+//    editor.header.rebuild();
   }
 
 
diff --git a/app/src/processing/app/SketchCode.java b/app/src/processing/app/SketchCode.java
index caeb5e6be..b078933d1 100644
--- a/app/src/processing/app/SketchCode.java
+++ b/app/src/processing/app/SketchCode.java
@@ -114,6 +114,8 @@ public class SketchCode {
   
   
   protected boolean renameTo(File what, String ext) {
+    System.out.println("renaming " + file);
+    System.out.println("      to " + what);
     boolean success = file.renameTo(what);
     if (success) {
       this.file = what;  // necessary?
diff --git a/todo.txt b/todo.txt
index 52cae6b9f..7cba076f5 100644
--- a/todo.txt
+++ b/todo.txt
@@ -49,6 +49,8 @@ X remove version number from splash image
 X   http://code.google.com/p/processing/issues/detail?id=324
 X Subfolders in /libraries folder not supported anymore (toxi)
 X   http://code.google.com/p/processing/issues/detail?id=578
+X even though it doesn't look modified in the GUI, sketch wants to be saved
+X   save untitled sketch, then try to rename, says "save before renaming"
 
 earlier
 X Unsatisfied Link Error running OPENGL on 64-bit ubuntu
@@ -58,8 +60,6 @@ X   is there a way to query the default browser? gnome-open? xdg-open?
 X   cleaned up some things inside settings, but this was already done
 X 64-bit windows causes UnsatisfiedLinkError with OpenGL
 
-_ even though it doesn't look modified in the GUI, sketch wants to be saved
-
 
 0196
 _ help casey re-export all applets for the site