4 files changed, 10 insertions, 1 deletions
diff --git a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
index a4a4610..9b96627 100644
--- a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
+++ b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
@@ -92,4 +92,9 @@ void QtSuggestingJIDInput::setSuggestions(const std::vector<Contact::ref>& sugge
 }
 
+void QtSuggestingJIDInput::clear() {
+	setText("");
+	currentContact_.reset();
+}
+
 void QtSuggestingJIDInput::keyPressEvent(QKeyEvent* event) {
 	if (event->key() == Qt::Key_Up) {
@@ -139,5 +144,4 @@ void QtSuggestingJIDInput::handleClicked(const QModelIndex& index) {
 	if (index.isValid()) {
 		currentContact_ = contactListModel_->getContact(index.row());
-		setText("");
 		onUserSelected(currentContact_->jid);
 		hidePopup();
diff --git a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h
index 25e7d42..71cd87d 100644
--- a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h
+++ b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h
@@ -34,4 +34,6 @@ class QtSuggestingJIDInput : public QLineEdit {
 		void setSuggestions(const std::vector<Contact::ref>& suggestions);
 
+		void clear();
+
 		boost::signal<void (const JID&)> onUserSelected;
 
diff --git a/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp b/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp
index 8ea49c4..2c34aa6 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp
@@ -59,4 +59,5 @@ bool QtUserSearchFirstMultiJIDPage::isComplete() const {
 
 void QtUserSearchFirstMultiJIDPage::reset() {
+	jid_->clear();
 	reason_->clear();
 }
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
index 260ccfe..ca84759 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -159,4 +159,5 @@ void QtUserSearchWindow::addContact() {
 	if (!!firstMultiJIDPage_->jid_->getContact()) {
 		contactVector_.push_back(firstMultiJIDPage_->jid_->getContact());
+		firstMultiJIDPage_->jid_->clear();
 	}
 	firstMultiJIDPage_->contactList_->setList(contactVector_);
@@ -274,4 +275,5 @@ void QtUserSearchWindow::addSearchedJIDToList(const JID& jid) {
 	jids.push_back(jid);
 	handleJIDsAdded(jids);
+	firstMultiJIDPage_->jid_->clear();
 }