diff --git a/CHANGES b/CHANGES
index 362272cfd..19b6c569f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,6 +21,7 @@ Bugfixes:
  - Python: Make sure GB link object isn't GC'd before GB object
  - GBA DMA: Fix Display Start DMAs
  - GBA DMA: Fix DMA start/end timing
+ - Qt: Fix window icon on X11
 Misc:
  - GBA Savedata: EEPROM performance fixes
  - GBA Savedata: Automatically map 1Mbit Flash files as 1Mbit Flash
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index 7d53ea420..f655998c0 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -85,6 +85,7 @@ Window::Window(CoreManager* manager, ConfigController* config, int playerId, QWi
 
 	m_logo.setDevicePixelRatio(m_screenWidget->devicePixelRatio());
 	m_logo = m_logo; // Free memory left over in old pixmap
+	setWindowIcon(m_logo);
 
 #if defined(M_CORE_GBA)
 	float i = 2;