diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index f24d5fcf2f6fda4e4a708bc536c90dd5876f9d96..52b299630b81cf0c953402383d1142e59a2b99d5 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.526 2007-05-04 14:27:41 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.527 2007-05-04 16:22:37 geuzaine Exp $
 //
 // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 //
@@ -4546,6 +4546,11 @@ void view_plugin_browser_cb(CALLBACK_ARGS)
   for(int i = 1; i <= WID->plugin_browser->size(); i++)
     ((GMSH_Plugin*)WID->plugin_browser->data(i))->dialogBox->group->hide();
   p->dialogBox->group->show();
+
+  if(iView >= 0)
+    WID->plugin_run->activate();
+  else
+    WID->plugin_run->deactivate();
 }
 
 void view_plugin_run_cb(CALLBACK_ARGS)
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index cfacb747edf22f01d5b3c32203048c10c8da6471..ec6c7999632cf4b844e866c8ba2eb65ddaba6504 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.609 2007-05-04 14:43:45 geuzaine Exp $
+// $Id: GUI.cpp,v 1.610 2007-05-04 16:22:37 geuzaine Exp $
 //
 // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 //
@@ -3564,6 +3564,8 @@ void GUI::reset_plugin_view_browser()
     plugin_view_browser->add("No Views");
     plugin_view_browser->deactivate();
   }
+
+  view_plugin_browser_cb(NULL, NULL);
 }
 
 void GUI::create_plugin_window(int numview)
@@ -3593,8 +3595,9 @@ void GUI::create_plugin_window(int numview)
     o->callback(view_plugin_cancel_cb);
   }
   {
-    Fl_Return_Button *o = new Fl_Return_Button(width - 2 * BB - 2 * WB, height - BH - WB, BB, BH, "Run");
-    o->callback(view_plugin_run_cb);
+    plugin_run = new Fl_Return_Button(width - 2 * BB - 2 * WB, height - BH - WB, BB, BH, "Run");
+    plugin_run->callback(view_plugin_run_cb);
+    plugin_run->deactivate();
   }
 
   int L1 = width / 4, L2 = 2 * L1 / 3;
diff --git a/Fltk/GUI.h b/Fltk/GUI.h
index 42d2df643dad6099ecd15335fe05f69ce30962f7..94f5002f42270316876b8e1e161133eb51fc41c8 100644
--- a/Fltk/GUI.h
+++ b/Fltk/GUI.h
@@ -217,6 +217,7 @@ public:
   Fl_Window        *plugin_window;
   Fl_Hold_Browser  *plugin_browser;
   Fl_Multi_Browser *plugin_view_browser;
+  Fl_Return_Button *plugin_run;
 
   // statistics window
   Fl_Window        *stat_window;