diff --git a/examples/clipboard.cxx b/examples/clipboard.cxx
index 3aa451d1c..5a2b10383 100644
--- a/examples/clipboard.cxx
+++ b/examples/clipboard.cxx
@@ -155,9 +155,7 @@ int main(int argc, char **argv)
   win->end();
   win->resizable(tabs);
   win->show(argc,argv);
-#if defined(__APPLE__) || defined(WIN32)
   clip_callback(1, tabs); // use clipboard content at start
-#endif
   Fl::add_clipboard_notify(clip_callback, tabs); // will update with new clipboard content immediately or at application activation
 
   Fl_Image::RGB_scaling(FL_RGB_SCALING_BILINEAR); // set bilinear image scaling method
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 64980ca11..b6dd69673 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -774,8 +774,8 @@ int Fl_X11_System_Driver::clipboard_contains(const char *type)
     if (event.type == SelectionNotify && event.xselection.property == None) return 0;
     i++; 
   }
-  while (i < 10 && event.type != SelectionNotify);
-  if (i >= 10) return 0;
+  while (i < 20 && event.type != SelectionNotify);
+  if (i >= 20) return 0;
   XGetWindowProperty(fl_display,
 		     event.xselection.requestor,
 		     event.xselection.property,