diff --git a/CHANGES b/CHANGES
index b0efd97fc..ba56bdbb9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
 CHANGES IN FLTK 1.1.8
 
+	- Fixed missing reset of flag in FLUID (STR #1187)
 	- Fixed maximizing in OS X (STR #1221)
 	- Fixed 'make distclean' to remove binaries inside
 	  MacOS app packages (STR #1169)
diff --git a/fluid/Fl_Window_Type.cxx b/fluid/Fl_Window_Type.cxx
index 050324d05..7e8e0000b 100644
--- a/fluid/Fl_Window_Type.cxx
+++ b/fluid/Fl_Window_Type.cxx
@@ -1467,6 +1467,7 @@ void Fl_Widget_Class_Type::write_code2() {
   if (((Fl_Window*)o)->resizable() == o)
     write_c("%sresizable(this);\n", indent());
   write_c("}\n");
+  current_widget_class = 0L;
 }
 
 ////////////////////////////////////////////////////////////////