diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp
index e3dc9c7730f795f866d9cd80cf1af60b76182d7d..6c738d3a3e0c7f0e7c77c644ba37edd03d1727b4 100644
--- a/Fltk/graphicWindow.cpp
+++ b/Fltk/graphicWindow.cpp
@@ -1992,7 +1992,7 @@ static Fl_Menu_Item bar_table[] = {
   {"&Help", 0, 0, 0, FL_SUBMENU},
     {"On&line Documentation", 0, (Fl_Callback *)help_online_cb, 0, FL_MENU_DIVIDER},
     {"&Keyboard and Mouse Usage",  FL_CTRL+'h', (Fl_Callback *)help_basic_cb, 0, FL_MENU_DIVIDER},
-    {"&Current Options",      0, (Fl_Callback *)status_options_cb, (void*)"?", 0},
+    {"&Current Options and Workspace", 0, (Fl_Callback *)status_options_cb, (void*)"?", 0},
     {"&Restore all Options to Default Settings", 0, (Fl_Callback *)options_restore_defaults_cb, 0, FL_MENU_DIVIDER},
     {"&About Gmsh",           0, (Fl_Callback *)help_about_cb, 0},
     {0},
@@ -2056,7 +2056,7 @@ static Fl_Menu_Item sysbar_table[] = {
   {"Help", 0, 0, 0, FL_SUBMENU},
     {"Online Documentation", 0, (Fl_Callback *)help_online_cb, 0, FL_MENU_DIVIDER},
     {"Keyboard and Mouse Usage",        0, (Fl_Callback *)help_basic_cb, 0, FL_MENU_DIVIDER},
-    {"Current Options",      0, (Fl_Callback *)status_options_cb, (void*)"?"},
+    {"Current Options and Workspace", 0, (Fl_Callback *)status_options_cb, (void*)"?"},
     {"Restore all Options to Default Settings", 0, (Fl_Callback *)options_restore_defaults_cb, 0},
     {0},
   {0}
diff --git a/Fltk/helpWindow.cpp b/Fltk/helpWindow.cpp
index cc67b60ad77652cfc30265fa0851525987e3b999..3031399ab41acc15033834073f64e9b770f9776f 100644
--- a/Fltk/helpWindow.cpp
+++ b/Fltk/helpWindow.cpp
@@ -371,25 +371,25 @@ helpWindow::helpWindow()
 
     options = new paletteWindow
       (width, height, CTX::instance()->nonModalWindows ? true : false,
-       "Current Options");
+       "Current Options and Worskspace");
     options->box(GMSH_WINDOW_BOX);
 
     int BW = (width - 4 * WB) / 3;
 
     modified = new Fl_Check_Button
-      (WB, WB, BW, BH, "Show modified");
+      (WB, WB, BW, BH, "Only show modified");
     modified->type(FL_TOGGLE_BUTTON);
     modified->callback(help_options_cb);
-    modified->tooltip("Show options with values different from defaults");
+    modified->tooltip("Show only values different from defaults");
 
     showhelp = new Fl_Check_Button
       (2 * WB + BW, WB, BW, BH, "Show help");
     showhelp->type(FL_TOGGLE_BUTTON);
     showhelp->callback(help_options_cb);
-    showhelp->tooltip("Show help string for each option");
+    showhelp->tooltip("Show help strings");
 
     Fl_Group* o = new Fl_Group(3 * WB + 2 * BW, WB, BW, BH);
-    o->tooltip("Filter options");
+    o->tooltip("Filter values");
     o->box(FL_DOWN_BOX);
     o->color(FL_BACKGROUND2_COLOR);
     search = new Fl_Input
@@ -407,12 +407,12 @@ helpWindow::helpWindow()
     browser->textsize(FL_NORMAL_SIZE - 2);
     browser->type(FL_MULTI_BROWSER);
     browser->callback(browser_cb);
-    browser->tooltip("Double-click to edit option");
+    browser->tooltip("Double-click to edit value");
 
     options->resizable(browser);
     options->position(Fl::x() + Fl::w()/2 - width / 2,
                       Fl::y() + Fl::h()/2 - height / 2);
-    options->size_range(about->w(), about->h());
+    options->size_range(width, height);
     options->end();
   }