diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp
index 8d2448c2b0..9b9b61fe13 100644
--- a/Windows/WindowsHost.cpp
+++ b/Windows/WindowsHost.cpp
@@ -156,6 +156,7 @@ void WindowsHost::ShutdownSound()
 
 void WindowsHost::UpdateUI()
 {
+	MainWindow::TranslateMenus();
 	MainWindow::Update();
 }
 
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index 428baa1f92..8b812dc1bf 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -78,8 +78,6 @@ extern InputState input_state;
 
 #define TIMER_CURSORUPDATE 1
 #define TIMER_CURSORMOVEUPDATE 2
-#define TIMER_TRANSLATE 3
-#define TRANSLATE_INTERVAL_MS 100
 #define CURSORUPDATE_INTERVAL_MS 50
 #define CURSORUPDATE_MOVE_TIMESPAN_MS 500
 
@@ -571,7 +569,6 @@ namespace MainWindow
 		RegisterRawInputDevices(dev, 2, sizeof(RAWINPUTDEVICE));
 
 		SetFocus(hwndDisplay);
-		SetTimer(hwndMain, TIMER_TRANSLATE, TRANSLATE_INTERVAL_MS, 0);
 
 		return TRUE;
 	}
@@ -828,11 +825,6 @@ namespace MainWindow
 				hideCursor = true;
 				KillTimer(hWnd, TIMER_CURSORMOVEUPDATE);
 				return 0;
-
-			case TIMER_TRANSLATE:
-				KillTimer(hWnd, TIMER_TRANSLATE);
-				TranslateMenus();
-				return 0;
 			}
 			break;
 
diff --git a/Windows/WndMainWindow.h b/Windows/WndMainWindow.h
index d969b7f659..8ebaf149da 100644
--- a/Windows/WndMainWindow.h
+++ b/Windows/WndMainWindow.h
@@ -54,4 +54,5 @@ namespace MainWindow
 	void SaveStateActionFinished(bool result, void *userdata);
 	void _ViewFullScreen(HWND hWnd);
 	void _ViewNormal(HWND hWnd);
+	void TranslateMenus();
 }
diff --git a/Windows/main.cpp b/Windows/main.cpp
index e22e9d6643..8f362733de 100644
--- a/Windows/main.cpp
+++ b/Windows/main.cpp
@@ -64,7 +64,7 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
 
 	wchar_t modulePath[MAX_PATH];
 	GetModuleFileName(NULL, modulePath, MAX_PATH);
-	for (int i = wcslen(modulePath) - 1; i > 0; i--) {
+	for (size_t i = wcslen(modulePath) - 1; i > 0; i--) {
 		if (modulePath[i] == '\\') {
 			modulePath[i] = 0;
 			break;