diff --git a/desktop-widgets/tagwidget.cpp b/desktop-widgets/tagwidget.cpp
index ad5ff7c38..093317d3b 100644
--- a/desktop-widgets/tagwidget.cpp
+++ b/desktop-widgets/tagwidget.cpp
@@ -7,9 +7,6 @@
 
 TagWidget::TagWidget(QWidget *parent) : GroupedLineEdit(parent), m_completer(NULL), lastFinishedTag(false)
 {
-	connect(this, SIGNAL(cursorPositionChanged()), this, SLOT(reparse()));
-	connect(this, SIGNAL(textChanged()), this, SLOT(reparse()));
-
 	QColor textColor = palette().color(QPalette::Text);
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 	float h, s, l, a;
@@ -39,8 +36,8 @@ void TagWidget::setCompleter(QCompleter *completer)
 {
 	m_completer = completer;
 	m_completer->setWidget(this);
-	connect(m_completer, SIGNAL(activated(QString)), this, SLOT(completionSelected(QString)));
-	connect(m_completer, SIGNAL(highlighted(QString)), this, SLOT(completionHighlighted(QString)));
+	connect(m_completer, QOverload<const QString &>::of(&QCompleter::activated), this, &TagWidget::completionSelected);
+	connect(m_completer, QOverload<const QString &>::of(&QCompleter::highlighted), this, &TagWidget::completionHighlighted);
 }
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
@@ -92,6 +89,13 @@ void TagWidget::highlight()
 	}
 }
 
+void TagWidget::inputMethodEvent(QInputMethodEvent *e)
+{
+	GroupedLineEdit::inputMethodEvent(e);
+	if (!e->commitString().isEmpty())
+		reparse();
+}
+
 void TagWidget::reparse()
 {
 	highlight();
@@ -196,6 +200,7 @@ void TagWidget::keyPressEvent(QKeyEvent *e)
 		keyPressEvent(&fakeEvent);
 	} else {
 		GroupedLineEdit::keyPressEvent(e);
+		reparse();
 	}
 	lastFinishedTag = finishedTag;
 }
diff --git a/desktop-widgets/tagwidget.h b/desktop-widgets/tagwidget.h
index 83e8b86b5..ea8a7ed93 100644
--- a/desktop-widgets/tagwidget.h
+++ b/desktop-widgets/tagwidget.h
@@ -18,20 +18,20 @@ public:
 	void clear();
 	void setCursorPosition(int position);
 	void wheelEvent(QWheelEvent *event);
-public
+private
 slots:
-	void reparse();
 	void completionSelected(const QString &text);
 	void completionHighlighted(const QString &text);
 
-protected:
+private:
 	void keyPressEvent(QKeyEvent *e) override;
 	void dragEnterEvent(QDragEnterEvent *e) override;
 	void dragLeaveEvent(QDragLeaveEvent *e) override;
 	void dragMoveEvent(QDragMoveEvent *e) override;
 	void dropEvent(QDropEvent *e) override;
-private:
 	void focusOutEvent(QFocusEvent *ev) override;
+	void inputMethodEvent(QInputMethodEvent *e) override;
+	void reparse();
 	QCompleter *m_completer;
 	bool lastFinishedTag;
 };