diff --git a/Source/MFCDialog/CMakeSetupDialog.cpp b/Source/MFCDialog/CMakeSetupDialog.cpp
index cf22c10e1..d9ca2de93 100644
--- a/Source/MFCDialog/CMakeSetupDialog.cpp
+++ b/Source/MFCDialog/CMakeSetupDialog.cpp
@@ -406,7 +406,8 @@ void CMakeSetupDialog::OnBuildProjects()
       }
     }
   // set the wait cursor
-  ::SetCursor(LoadCursor(NULL, IDC_WAIT));
+  ::SetCursor(LoadCursor(NULL, IDC_WAIT));  
+
   // get all the info from the dialog
   this->UpdateData();
   if(!m_BuildPathChanged)
diff --git a/Source/MFCDialog/PropertyList.cpp b/Source/MFCDialog/PropertyList.cpp
index d18f30e37..ebb26def5 100644
--- a/Source/MFCDialog/PropertyList.cpp
+++ b/Source/MFCDialog/PropertyList.cpp
@@ -34,6 +34,7 @@ CPropertyList::~CPropertyList()
 BEGIN_MESSAGE_MAP(CPropertyList, CListBox)
   //{{AFX_MSG_MAP(CPropertyList)
   ON_WM_CREATE()
+  ON_WM_VSCROLL()
   ON_CONTROL_REFLECT(LBN_SELCHANGE, OnSelchange)
   ON_WM_LBUTTONUP()
   ON_WM_KILLFOCUS()
@@ -356,6 +357,27 @@ void CPropertyList::OnChangeEditBox()
     }
 }
 
+void CPropertyList::OnVScroll( UINT nSBCode, UINT nPos, CScrollBar* pScrollBar )
+{
+  if(m_editBox)
+    {
+    m_editBox.ShowWindow(SW_HIDE);
+    }
+  if(m_cmbBox)
+    {
+    m_cmbBox.ShowWindow(SW_HIDE);
+    }
+  if(m_CheckBoxControl)
+    {
+    m_CheckBoxControl.ShowWindow(SW_HIDE);
+    }
+  if(m_btnCtrl)
+    {
+    m_btnCtrl.ShowWindow(SW_HIDE);
+    }
+  CListBox::OnVScroll(nSBCode, nPos, pScrollBar);
+}
+
 void CPropertyList::OnCheckBox()
 { 
   CPropertyItem* pItem = (CPropertyItem*) GetItemDataPtr(m_curSel);
diff --git a/Source/MFCDialog/PropertyList.h b/Source/MFCDialog/PropertyList.h
index 235588b39..9224e6d0c 100644
--- a/Source/MFCDialog/PropertyList.h
+++ b/Source/MFCDialog/PropertyList.h
@@ -104,6 +104,8 @@ protected:
   afx_msg void OnDelete();
   afx_msg void OnHelp();
   afx_msg void OnCheckBox();
+  afx_msg void OnVScroll( UINT nSBCode, UINT nPos, CScrollBar* pScrollBar );
+
 
   DECLARE_MESSAGE_MAP()
 
diff --git a/Source/MFCDialog/resource.h b/Source/MFCDialog/resource.h
index 1a7c3d37a..faa562621 100644
--- a/Source/MFCDialog/resource.h
+++ b/Source/MFCDialog/resource.h
@@ -17,6 +17,7 @@
 #define IDC_CMAKE_VERSION               1014
 #define IDC_FRAME                       1015
 #define IDC_MouseHelpCaption            1016
+#define IDC_CompilingText               1017
 
 // Next default values for new objects
 // 
@@ -24,7 +25,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        133
 #define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1017
+#define _APS_NEXT_CONTROL_VALUE         1018
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif