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
@@ -47,10 +47,11 @@
 #include <SwifTools/TabComplete.h>
 #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>
 #include <Swift/QtUI/QtTextEdit.h>
 #include <Swift/QtUI/QtUISettingConstants.h>
@@ -643,10 +644,11 @@ void QtChatWindow::handleEmoticonsButtonClicked() {
        emoticonsMenu_->exec(QPoint(QCursor::pos().x() - menuSize.width(), QCursor::pos().y() - menuSize.height()));
 }
 void QtChatWindow::handleEmoticonClicked(QString emoticonAsText) {
        input_->textCursor().insertText(emoticonAsText);
+        input_->setFocus();
 }
 void QtChatWindow::handleTextInputReceivedFocus() {
        lastLineTracker_.setHasFocus(true);
        input_->setFocus();
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
@@ -18,11 +18,10 @@
 #include <SwifTools/LastLineTracker.h>
 #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>
 class QTextEdit;
@@ -39,10 +38,11 @@ namespace Swift {
        class TreeWidget;
        class QtTextEdit;
        class UIEventStream;
        class QtChatWindowJSBridge;
        class SettingsProvider;
+        class QtEmoticonsGrid;
        class LabelModel : public QAbstractListModel {
                Q_OBJECT
                public:
                        LabelModel(QObject* parent = NULL) : QAbstractListModel(parent) {}