diff --git a/win32/FireflyShell/AboutPage.cpp b/win32/FireflyShell/AboutPage.cpp
index c5593601..b2aa89c9 100644
--- a/win32/FireflyShell/AboutPage.cpp
+++ b/win32/FireflyShell/AboutPage.cpp
@@ -32,6 +32,8 @@ LRESULT CAboutPage::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lPar
 
 void CAboutPage::FillVersionList()
 {
+	CWaitCursor wait;
+
 	m_versions.Empty();
 
 	// Initialise the list control
diff --git a/win32/FireflyShell/AdvancedPage.cpp b/win32/FireflyShell/AdvancedPage.cpp
index 31d691f4..b9542f32 100644
--- a/win32/FireflyShell/AdvancedPage.cpp
+++ b/win32/FireflyShell/AdvancedPage.cpp
@@ -21,6 +21,8 @@
 
 LRESULT CAdvancedPage::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
 {
+	CWaitCursor wait;
+
 	IniFile ini(GetApplication()->GetConfigPath());
 	m_server_port = ini.GetInteger(_T("general"), _T("port"), 9999);
 
@@ -108,6 +110,8 @@ void CAdvancedPage::UpdateControls(Service::Status status)
 
 int CAdvancedPage::OnApply()
 {
+	CWaitCursor wait;
+
 	ATLTRACE("CAdvancedPage::OnApply\n");
 
 	if (!DoDataExchange(true))
@@ -149,6 +153,8 @@ LRESULT CAdvancedPage::OnStopService(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*
 
 LRESULT CAdvancedPage::OnWebAdmin(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
 {
+	CWaitCursor wait;
+
 	// Go to the config file because we might not have committed a change yet.
 	IniFile ini(GetApplication()->GetConfigPath());
 	unsigned int port = ini.GetInteger(_T("general"), _T("port"), 9999);
diff --git a/win32/FireflyShell/ConfigPage.cpp b/win32/FireflyShell/ConfigPage.cpp
index 0c723d0f..299c248f 100644
--- a/win32/FireflyShell/ConfigPage.cpp
+++ b/win32/FireflyShell/ConfigPage.cpp
@@ -21,6 +21,8 @@
 
 LRESULT CConfigPage::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
 {
+	CWaitCursor wait;
+
 	IniFile ini(GetApplication()->GetConfigPath());
 	
 	m_server_name = ini.GetString(_T("general"), _T("servername"), _T("Firefly media server"));
@@ -52,6 +54,8 @@ void CConfigPage::EnableControls()
 
 int CConfigPage::OnApply()
 {
+	CWaitCursor wait;
+
 	ATLTRACE("CConfigPage::OnApply\n");
 	if (!DoDataExchange(true))
 		return false;