diff --git a/desmume/src/windows/CWindow.cpp b/desmume/src/windows/CWindow.cpp
index 01bf6ee7d..7c5d48886 100644
--- a/desmume/src/windows/CWindow.cpp
+++ b/desmume/src/windows/CWindow.cpp
@@ -115,6 +115,7 @@ CToolWindow::CToolWindow(int ID, DLGPROC proc, char* title)
 		return;
 
 	SetWindowText(hWnd, title);
+	SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(hAppInst, "ICONDESMUME"));
 }
 
 CToolWindow::~CToolWindow()