diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9f83d306..df020dd91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -85,6 +85,7 @@
 - Bugfix: Fix BTTV/FFZ channel emotes saying unknown error when no emotes found (#2542)
 - Bugfix: Fix directory not opening when clicking "Open AppData Directory" setting button on macOS (#2531, #2537)
 - Bugfix: Fix quickswitcher not respecting order of tabs when filtering (#2519, #2561)
+- Bugfix: Fix GNOME not associating Chatterino's window with its desktop entry (#1863, #2587)
 - Dev: Updated minimum required Qt framework version to 5.12. (#2210)
 - Dev: Migrated `Kraken::getUser` to Helix (#2260)
 - Dev: Migrated `TwitchAccount::(un)followUser` from Kraken to Helix and moved it to `Helix::(un)followUser`. (#2306)
diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
index 23cc8c356..6ee453543 100644
--- a/resources/com.chatterino.chatterino.desktop
+++ b/resources/com.chatterino.chatterino.desktop
@@ -7,3 +7,4 @@ Exec=chatterino
 Icon=chatterino
 Terminal=false
 Categories=Network;InstantMessaging;
+StartupWMClass=chatterino