diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49a77bf2..56a73c3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unversioned
 
+- Minor: Message input is now focused when clicking on emotes. (#4719)
 - Minor: Changed viewer list to chatter list to more match Twitch's terminology. (#4732)
 - Minor: Nicknames are now taken into consideration when searching for messages. (#4663)
 - Minor: Add an icon showing when streamer mode is enabled (#4410, #4690)
diff --git a/src/widgets/splits/SplitInput.cpp b/src/widgets/splits/SplitInput.cpp
index c76e48f6..2c6dee62 100644
--- a/src/widgets/splits/SplitInput.cpp
+++ b/src/widgets/splits/SplitInput.cpp
@@ -307,6 +307,7 @@ void SplitInput::openEmotePopup()
                     textToInsert = " " + textToInsert;
                 }
                 this->insertText(textToInsert);
+                this->ui_.textEdit->activateWindow();
             }
         });
     }