diff --git a/CHANGES b/CHANGES
index 198e46f4b..770f8b62b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@ CHANGES IN FLTK 1.1.7
 
 	- Documentation fixes (STR #648, STR #692, STR #730, STR
 	  #744, STR #745)
+	- Fluid should not open the Display connection anymore if
+	  creating code only (STR #904)
 	- Improved hidden copy / ctor implementation (STR #860)
 	- Increased matrix stack depth and added over/underfolw error
 	  (STR #924)
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index 3aa85b048..d6af4db2b 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -1649,6 +1649,9 @@ Fl_Menu_Item Main_Menu[] = {
 extern void fill_in_New_Menu();
 
 void scheme_cb(Fl_Choice *, void *) {
+  if (compile_only)
+    return;
+
   switch (scheme_choice->value()) {
     case 0 : // Default
       Fl::scheme(NULL);