diff --git a/history.txt b/history.txt
index 23ead55ee..426bdfb9a 100644
--- a/history.txt
+++ b/history.txt
@@ -13,6 +13,7 @@
  * Remove "Settings read from I2P router" message
  * Set graph values to 0 when router is gone
  * Clear graph after changing router host/port
+ * Don't clear graph when user closes the window
  * Update to jchart2d 3.2.2 2011-09-25
  * Remove debug output
  * README updates
diff --git a/src/net/i2p/itoopie/ItoopieVersion.java b/src/net/i2p/itoopie/ItoopieVersion.java
index 272343f39..ed0ad2026 100644
--- a/src/net/i2p/itoopie/ItoopieVersion.java
+++ b/src/net/i2p/itoopie/ItoopieVersion.java
@@ -6,10 +6,10 @@ package net.i2p.itoopie;
  *
  */
 public class ItoopieVersion {
-	
+
 	/** Version of itoopie */
-	public static final String VERSION = "0.0.4-beta4";
-	
+	public static final String VERSION = "0.0.4-beta5";
+
 	/** Version of the I2PControl API implemented */
 	public static final int I2PCONTROL_API_VERSION = 1; 
 }
diff --git a/src/net/i2p/itoopie/gui/WindowHandler.java b/src/net/i2p/itoopie/gui/WindowHandler.java
index 8e3ecbffa..46625c3e4 100644
--- a/src/net/i2p/itoopie/gui/WindowHandler.java
+++ b/src/net/i2p/itoopie/gui/WindowHandler.java
@@ -19,7 +19,13 @@ public class WindowHandler {
 	}
 	
 	public static void deRegister(JFrame frame){
-		_frames.remove(frame);
+		// don't remove the main frame when
+		// the user clicks on the X, so we have the updated
+		// graph when the user clicks on the icon again
+		if (frame == mainFrame)
+			hideFrames();
+		else
+			_frames.remove(frame);
 	}
 	
 	public static void hideFrames(){