diff --git a/docs/TODO.txt b/docs/TODO.txt
index 35a1ea681..c1569bbab 100644
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -6,7 +6,7 @@ Copyright (c) 2004 by Bill Kendrick
 bill@newbreedsoftware.com
 http://www.newbreedsoftware.com/tuxpaint/
 
-May 30, 2004
+June 1, 2004
 
 HIGH-PRIORITY DOCUMENTATION CHANGES:
 ------------------------------------
@@ -45,6 +45,9 @@ HIGH-PRIORITY IMPLEMENTATION CHANGES:
     outlines of shapes/pictures for kids to color, like a coloring book.
     The outlines would always remain 'above' the paint.
 
+    FIXME: "Erase" icon on Open screen should disable when you click
+    an immutable image.  Re-enable when clicking a saved image.
+
   * Background mode -- immutable images stored in Tux Paint's "data"
     directory, but available via the "Open" dialog.  They would be
     background images (a 'scene'), and possibly foreground elements,
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index dd1028ac1..e2d970843 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -10179,7 +10179,10 @@ int do_open(int want_new_tool)
 	     
 	      
 	/* "Erase" button: */
-	      
+	
+	/* FIXME: Deactivate if an immutable file ("starter") is
+	   selected.  Reactivate when clicking a normal (saved) file. */
+
 	dest.x = WINDOW_WIDTH - 96 - 48 - 48;
 	dest.y = (48 * 7 + 40 + HEIGHTOFFSET) - 48;
 	SDL_BlitSurface(img_erase, NULL, screen, &dest);
@@ -10398,10 +10401,10 @@ int do_open(int want_new_tool)
 		    {
 		      /* Erase */
 		  
-		      want_erase = 1;
-		    }
-		}
-	      else if (event.type == SDL_MOUSEMOTION)
+             want_erase = 1;
+           }
+       }
+     else if (event.type == SDL_MOUSEMOTION)
 		{
 		  /* Deal with mouse pointer shape! */
 
@@ -10562,12 +10565,19 @@ int do_open(int want_new_tool)
 		      do_save();
 		    }
 		}
-	    
+	   
+
+	      /* BEGIN FIXME: Determine if this was a 'starter' image, and
+	         use a different path if so... */
+
 	      snprintf(fname, sizeof(fname), "saved/%s%s",
 		       d_names[which], d_exts[which]);
 	  
 	      rfname = get_fname(fname);
+
+	      /* -- END FIXME -- */
 	  
+
 #ifdef SAVE_AS_BMP
 	      img = SDL_LoadBMP(rfname);
 #else
@@ -10603,6 +10613,9 @@ int do_open(int want_new_tool)
 		  cur_undo = 0;
 		  oldest_undo = 0;
 		  newest_undo = 0;
+
+		  /* FIXME: Set values so that we don't try to
+		     re-save immutable images */
 	      
 		  been_saved = 1;
 		  reset_avail_tools();