2 files changed, 3 insertions, 1 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index ffcbf15..3818991 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -49,6 +49,7 @@
 
 #include <Swift/QtUI/QtAddBookmarkWindow.h>
 #include <Swift/QtUI/QtEditBookmarkWindow.h>
+#include <Swift/QtUI/QtEmoticonsGrid.h>
 #include <Swift/QtUI/QtPlainChatView.h>
 #include <Swift/QtUI/QtScaledAvatarCache.h>
 #include <Swift/QtUI/QtSettingsProvider.h>
@@ -645,6 +646,7 @@ void QtChatWindow::handleEmoticonsButtonClicked() {
 
 void QtChatWindow::handleEmoticonClicked(QString emoticonAsText) {
 	input_->textCursor().insertText(emoticonAsText);
+	input_->setFocus();
 }
 
 void QtChatWindow::handleTextInputReceivedFocus() {
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h
index 19046c9..8d7db59 100644
--- a/Swift/QtUI/QtChatWindow.h
+++ b/Swift/QtUI/QtChatWindow.h
@@ -20,7 +20,6 @@
 
 #include <Swift/QtUI/ChatSnippet.h>
 #include <Swift/QtUI/QtAffiliationEditor.h>
-#include <Swift/QtUI/QtEmoticonsGrid.h>
 #include <Swift/QtUI/QtMUCConfigurationWindow.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
 #include <Swift/QtUI/QtTabbable.h>
@@ -41,6 +40,7 @@ namespace Swift {
 	class UIEventStream;
 	class QtChatWindowJSBridge;
 	class SettingsProvider;
+	class QtEmoticonsGrid;
 
 	class LabelModel : public QAbstractListModel {
 		Q_OBJECT