diff --git a/src/org/zaproxy/zap/HeadlessBootstrap.java b/src/org/zaproxy/zap/HeadlessBootstrap.java
index <HASH>..<HASH> 100644
--- a/src/org/zaproxy/zap/HeadlessBootstrap.java
+++ b/src/org/zaproxy/zap/HeadlessBootstrap.java
@@ -43,7 +43,9 @@ abstract class HeadlessBootstrap extends ZapBootstrap {
     public HeadlessBootstrap(CommandLine args) {
         super(args);
 
-        System.setProperty("java.awt.headless", "true");
+        // XXX Do not force headless to allow to run JxBrowser in daemon mode,
+        // at least until it can be run without a window/dialogue.
+        // System.setProperty("java.awt.headless", "true");
     }
 
     /**
Do not set/force headless AWT

Change HeadlessBootstrap to not set/force headless AWT, to allow to run
JxBrowser when ZAP is run in daemon mode.