diff --git a/apps/desktopgui/TODO b/apps/desktopgui/TODO
index dd1610223..1a62d7722 100644
--- a/apps/desktopgui/TODO
+++ b/apps/desktopgui/TODO
@@ -11,6 +11,10 @@ HIGH PRIORITY:
 - Check if we're inside I2P without using a command-line parameter - DONE
 - Modify installer to set I2P directory parameter; or use $I2P? - Is already there
 - Include in installer - TODO
+- Start desktopgui without adding to clients.config and without adding a dependency on routerconsole!
+  * One possibility:
+        Adding some kind of 'ApplicationManager' that allows starting applications.
+        Extra remark: ApplicationManager should also allow stopping certain applications from launching.
 - Fix tabs versus spaces ;-)
 UNKNOWN:
 - API to allow applications to add themselves to the menu?
diff --git a/apps/desktopgui/src/net/i2p/desktopgui/router/RouterManager.java b/apps/desktopgui/src/net/i2p/desktopgui/router/RouterManager.java
index 8caafe397..b107d47d9 100644
--- a/apps/desktopgui/src/net/i2p/desktopgui/router/RouterManager.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/router/RouterManager.java
@@ -74,7 +74,7 @@ public class RouterManager {
 	 */
 	public static void shutDown() {
 		if(inI2P()) {
-			getRouter().shutdownGracefully();
+			getRouter().shutdown(0);
 		}
     }