1 files changed, 8 insertions, 0 deletions
diff --git a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
index 2b775f9..8ed6efb 100644
--- a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
+++ b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
@@ -129,12 +129,17 @@ void QtSuggestingJIDInput::keyPressEvent(QKeyEvent* event) {
 		editingDone();
 	} else {
 		QLineEdit::keyPressEvent(event);
 	}
 }
 
+void QtSuggestingJIDInput::hideEvent(QHideEvent* /* event */) {
+	// Hide our popup when we are hidden (can happen when a dialog is closed by the user).
+	treeViewPopup_->hide();
+}
+
 void QtSuggestingJIDInput::handleApplicationFocusChanged(QWidget* /*old*/, QWidget* /*now*/) {
 	/* Using the now argument gives use the wrong widget. This is part of the code needed
 	   to prevent stealing of focus when opening a the suggestion window. */
 	QWidget* now = qApp->focusWidget();
 	if (!now || (now != treeViewPopup_ && now != this && !now->isAncestorOf(this) && !now->isAncestorOf(treeViewPopup_) && !this->isAncestorOf(now) && !treeViewPopup_->isAncestorOf(now))) {
 		hidePopup();
@@ -193,9 +198,12 @@ void QtSuggestingJIDInput::showPopup() {
 	setFocus();
 }
 
 void QtSuggestingJIDInput::hidePopup() {
 	disconnect(qApp, SIGNAL(focusChanged(QWidget*, QWidget*)), this, SLOT(handleApplicationFocusChanged(QWidget*, QWidget*)));
 	treeViewPopup_->hide();
+
+	// Give focus back to input widget because the hide() call passes the focus to the wrong widget.
+	setFocus();
 }
 
 }