diff --git a/src/StepMania.cpp b/src/StepMania.cpp
index 46cb06a12f..1be66c486d 100644
--- a/src/StepMania.cpp
+++ b/src/StepMania.cpp
@@ -1011,7 +1011,7 @@ int main(int argc, char* argv[])
 	GAMESTATE	= new GameState;
 
 	// This requires PREFSMAN, for PREFSMAN->m_bShowLoadingWindow.
-	LoadingWindow *pLoadingWindow = LoadingWindow::Create();
+	pLoadingWindow = LoadingWindow::Create();
 	if(pLoadingWindow == NULL)
 		RageException::Throw("%s", COULDNT_OPEN_LOADING_WINDOW.GetValue().c_str());
 
diff --git a/src/ThemeManager.cpp b/src/ThemeManager.cpp
index 0b3841869f..0e5764c4a6 100644
--- a/src/ThemeManager.cpp
+++ b/src/ThemeManager.cpp
@@ -8,6 +8,7 @@
 #include "RageTimer.h"
 #include "FontCharAliases.h"
 #include "arch/ArchHooks/ArchHooks.h"
+#include "arch/LoadingWindow/LoadingWindow.h"
 #include "arch/Dialog/Dialog.h"
 #include "RageFile.h"
 #if !defined(SMPACKAGE)
@@ -397,6 +398,8 @@ void ThemeManager::SwitchThemeAndLanguage( const RString &sThemeName_, const RSt
 	if( bNothingChanging && !bForceThemeReload )
 		return;
 
+	if(pLoadingWindow) pLoadingWindow->SetText("Loading theme & language...");
+
 	m_bPseudoLocalize = bPseudoLocalize;
 
 	// Load theme metrics. If only the language is changing, this is all
diff --git a/src/arch/LoadingWindow/LoadingWindow.cpp b/src/arch/LoadingWindow/LoadingWindow.cpp
index 2002e81f45..130d298a04 100644
--- a/src/arch/LoadingWindow/LoadingWindow.cpp
+++ b/src/arch/LoadingWindow/LoadingWindow.cpp
@@ -53,6 +53,8 @@ LoadingWindow *LoadingWindow::Create()
 	return ret;
 }
 
+LoadingWindow *pLoadingWindow;
+
 /*
  * (c) 2002-2005 Glenn Maynard
  * All rights reserved.
diff --git a/src/arch/LoadingWindow/LoadingWindow.h b/src/arch/LoadingWindow/LoadingWindow.h
index 952c469ab8..dcd3a339c5 100644
--- a/src/arch/LoadingWindow/LoadingWindow.h
+++ b/src/arch/LoadingWindow/LoadingWindow.h
@@ -21,6 +21,8 @@ protected:
 	int m_totalWork;
 };
 
+extern LoadingWindow *pLoadingWindow;
+
 #endif
 
 /**