diff --git a/Source/MFCDialog/CMakeSetupDialog.cpp b/Source/MFCDialog/CMakeSetupDialog.cpp
index 829814418..e3c00e8d2 100644
--- a/Source/MFCDialog/CMakeSetupDialog.cpp
+++ b/Source/MFCDialog/CMakeSetupDialog.cpp
@@ -1454,6 +1454,10 @@ void CMakeSetupDialog::OnDropFiles(HDROP hDropInfo)
 
 BOOL CMakeSetupDialog::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message) 
 {
-   ::SetCursor(m_Cursor);
+  CDialog::OnSetCursor(pWnd, nHitTest, message);
+  if(m_Cursor == LoadCursor(NULL, IDC_WAIT))
+    {
+    ::SetCursor(m_Cursor);
+    }
    return true;
 }