diff --git a/Fltk/menuWindow.cpp b/Fltk/menuWindow.cpp
index e281f24736742293c8fb2b3caaa0746a78f0dd9a..42e547abdc24a85b9fa9f910636bc5246292c109 100644
--- a/Fltk/menuWindow.cpp
+++ b/Fltk/menuWindow.cpp
@@ -147,6 +147,8 @@ static void file_open_cb(Fl_Widget *w, void *data)
   }
   if(n != (int)PView::list.size())
     FlGui::instance()->menu->setContext(menu_post, 0);
+  if(CTX::instance()->launchOnelabAtStartup != -2)
+    solver_cb(0, (void*)CTX::instance()->launchOnelabAtStartup);
 }
 
 static void file_merge_cb(Fl_Widget *w, void *data)
@@ -161,6 +163,8 @@ static void file_merge_cb(Fl_Widget *w, void *data)
   }
   if(n != (int)PView::list.size())
     FlGui::instance()->menu->setContext(menu_post, 0);
+  if(CTX::instance()->launchOnelabAtStartup != -2)
+    solver_cb(0, (void*)CTX::instance()->launchOnelabAtStartup);
 }
 
 static void file_open_recent_cb(Fl_Widget *w, void *data)
diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp
index 40f58dc9146a016b1f9548c715538b54cdcc401a..8d9a56eead0c74f2d6d85b14ccd5a07298e6e85c 100644
--- a/Fltk/onelabWindow.cpp
+++ b/Fltk/onelabWindow.cpp
@@ -1391,6 +1391,8 @@ void solver_cb(Fl_Widget *w, void *data)
     FlGui::instance()->onelab->show();
   else
     onelab_cb(0, (num >= 0) ? (void*)"check" : (void*)"refresh");
+
+  CTX::instance()->launchOnelabAtStartup = -2;
 }
 
 void flgui_wait_cb(double time)
diff --git a/doc/gmsh.html b/doc/gmsh.html
index cb11d9ee13d0a8b242bc7fea0d4e210d6909ec24..f5b086d12267f069024bf9a816b55ab092b9289a 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -300,16 +300,16 @@ thumbnail"></a>
   </ul>
   High-order meshing and visualization
   <ul class="small">
-    <li>J.-F. Remacle, N. Chevaugeon, E. Marchandise and
-      C. Geuzaine. <em>Efficient Visualization of High-Order Finite
-      Elements</em>. International Journal for Numerical Methods in Engineering
-      69(4), pp. 750-771, 2007. (<a href="gmsh_visu_preprint.pdf">PDF</a>)
     <li>A. Johnen, J.-F. Remacle and C. Geuzaine. <em>Geometric validity of
       High-Order Triangular Finite Elements</em>. Engineering with Computers, in
       press, 2012. (<a href="gmsh_curved2_preprint.pdf">PDF</a>)
     <li>A. Johnen, J.-F. Remacle and C. Geuzaine. <em>Geometric validity of
         Curvilinear Finite elements</em>. Journal of Computational Physics, in
       press, 2012. (<a href="gmsh_curved_preprint.pdf">PDF</a>)
+    <li>J.-F. Remacle, N. Chevaugeon, E. Marchandise and
+      C. Geuzaine. <em>Efficient Visualization of High-Order Finite
+      Elements</em>. International Journal for Numerical Methods in Engineering
+      69(4), pp. 750-771, 2007. (<a href="gmsh_visu_preprint.pdf">PDF</a>)
   </ul>
   Ocean meshing
   <ul class="small">