diff --git a/README.md b/README.md
index 8c51bb88..375e893e 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ Specifically there is support for:
 - Sending & receiving invites.
 - Sending & receiving files and emoji (inline widgets for images, audio and file messages).
 - Typing notifications.
+- Username auto-completion.
 - Message & mention notifications.
 - Redacting messages.
 - Read receipts.
diff --git a/src/TextInputWidget.cc b/src/TextInputWidget.cc
index e184d8b4..fde4a061 100644
--- a/src/TextInputWidget.cc
+++ b/src/TextInputWidget.cc
@@ -15,8 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <thread>
-
 #include <QAbstractTextDocumentLayout>
 #include <QApplication>
 #include <QBuffer>
@@ -29,6 +27,7 @@
 #include <QMimeType>
 #include <QPainter>
 #include <QStyleOption>
+#include <QtConcurrent>
 
 #include <variant.hpp>
 
@@ -437,7 +436,7 @@ TextInputWidget::TextInputWidget(QWidget *parent)
                 if (q.isEmpty() || currState_.isNull())
                         return;
 
-                std::thread worker([this, q = q.toLower().toStdString()]() {
+                QtConcurrent::run([this, q = q.toLower().toStdString()]() {
                         std::multimap<int, std::pair<std::string, std::string>> items;
 
                         auto get_name = [](auto membership) {
@@ -476,8 +475,6 @@ TextInputWidget::TextInputWidget(QWidget *parent)
 
                         emit input_->resultsRetrieved(results);
                 });
-
-                worker.detach();
         });
 
         sendMessageBtn_ = new FlatButton(this);