diff --git a/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx b/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx
index d42bd3d52..a9e36609d 100644
--- a/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx
+++ b/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx
@@ -352,8 +352,10 @@ CMakeSetupGUIImplementation
   // update the GUI with any new values in the caused by the
   // generation process
   this->LoadCacheFromDiskToGUI();
+
   // path is up-to-date now
   m_BuildPathChanged = false;
+
   // put the cursor back
   fl_cursor(FL_CURSOR_DEFAULT,FL_BLACK,FL_WHITE);
   fl_message("Done !");
@@ -405,6 +407,8 @@ CMakeSetupGUIImplementation
 {
 
   // Prepare to add rows to the scroll
+  m_CacheEntriesList.RemoveAll();
+  propertyListPack->clear();
   propertyListPack->begin();
 
   const cmCacheManager::CacheEntryMap &cache =
@@ -415,7 +419,6 @@ CMakeSetupGUIImplementation
     const char* key = i->first.c_str();
     const cmCacheManager::CacheEntry& value = i->second;
     
-
     switch(value.m_Type )
       {
       case cmCacheManager::BOOL:
@@ -453,6 +456,10 @@ CMakeSetupGUIImplementation
                                        fltk::PropertyList::EDIT,"");
         break;
       case cmCacheManager::INTERNAL:
+        m_CacheEntriesList.AddProperty(key,
+                                       value.m_Value.c_str(),
+                                       value.m_HelpString.c_str(),
+                                       fltk::PropertyList::EDIT,"");
         break;
       }
 
@@ -462,6 +469,10 @@ CMakeSetupGUIImplementation
   propertyListPack->init_sizes();
   cacheValuesScroll->position( 0, 0 );
 
+  propertyListPack->redraw();
+
+  Fl::check();
+
   this->UpdateData(false);
 
 }
diff --git a/Source/FLTKDialog/FLTKPropertyItemRow.cxx b/Source/FLTKDialog/FLTKPropertyItemRow.cxx
index 078a7e5c7..e1d286aa3 100644
--- a/Source/FLTKDialog/FLTKPropertyItemRow.cxx
+++ b/Source/FLTKDialog/FLTKPropertyItemRow.cxx
@@ -189,8 +189,8 @@ NameButtonCallback( Fl_Widget * widget, void * data)
   static Fl_Menu_Button * popupMenu = 0;
   if( !popupMenu )
   {
-    int lastMousePositionX = Fl::event_x_root();
-    int lastMousePositionY = Fl::event_y_root();
+    int lastMousePositionX = Fl::event_x();
+    int lastMousePositionY = Fl::event_y();
     popupMenu = new Fl_Menu_Button(lastMousePositionX,
                                    lastMousePositionY,100,200);
   }