diff --git a/src/osd/osddbus.cpp b/src/osd/osddbus.cpp
index 66d758d4e..3352aefd3 100644
--- a/src/osd/osddbus.cpp
+++ b/src/osd/osddbus.cpp
@@ -141,10 +141,8 @@ void OSDDBus::ShowMessageNative(const QString &summary, const QString &message,
   if (!interface_) return;
 
   QVariantMap hints;
-  QString summary_stripped = summary;
-  QString message_stripped = message;
-  summary_stripped = summary_stripped.replace('&', "&").simplified();
-  message_stripped = message_stripped.replace('&', "&").simplified();
+  QString summary_stripped = summary.toHtmlEscaped();
+  QString message_stripped = message.toHtmlEscaped();
 
   if (!image.isNull()) {
     if (version_ >= QVersionNumber(1, 2)) {