diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
index 8bd19b1fe48a8c79ff96d37c22c545b0b650cc76..9b2bcf9ca9c0c05caa010a42b437ab6709dbba2e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
@@ -332,15 +332,25 @@ public class ConfigServiceHandler extends FormHandler {
                 ClientApp dtg = mgr.getRegisteredApp("desktopgui");
                 if (dtg != null) {
                     if (enable) {
-                        if (dtg.getState() == ClientAppState.STOPPED)
+                        if (dtg.getState() == ClientAppState.STOPPED) {
                             dtg.startup();
+                            addFormNotice(_t("Enabled system tray"));
+                        }
                     } else {
-                        if (dtg.getState() == ClientAppState.RUNNING)
+                        if (dtg.getState() == ClientAppState.RUNNING) {
                             dtg.shutdown(null);
+                            addFormNotice(_t("Disabled system tray"));
+                        }
                     }
                 } else if (enable) {
+                    // already set to true, GraphicsEnvironment initialized, can't change it now
+                    if (Boolean.valueOf(System.getProperty("java.awt.headless"))) {
+                        addFormError(_t("Restart required to take effect"));
+                    } else {
                         dtg = new net.i2p.desktopgui.Main(_context, mgr, null);    
                         dtg.startup();
+                        addFormNotice(_t("Enabled system tray"));
+                    }
                 }
             } catch (Throwable t) {
                 if (enable)