diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx
index 5dbd3ad62400..7d384d7b403b 100644
--- a/vcl/qt5/QtBuilder.cxx
+++ b/vcl/qt5/QtBuilder.cxx
@@ -921,11 +921,17 @@ void QtBuilder::setButtonProperties(QAbstractButton& rButton, stringmap& rProps,
 
     if (QDialogButtonBox* pButtonBox = qobject_cast<QDialogButtonBox*>(pParentWidget))
     {
-        pButtonBox->addButton(&rButton, QDialogButtonBox::NoRole);
-
         // for message boxes, avoid implicit standard buttons in addition to those explicitly added
+        // and add button via QMessageBox API instead of via the button box
         if (QMessageBox* pMessageBox = qobject_cast<QMessageBox*>(pParentWidget->window()))
+        {
             pMessageBox->setStandardButtons(QMessageBox::NoButton);
+            pMessageBox->addButton(&rButton, QMessageBox::ButtonRole::NoRole);
+        }
+        else
+        {
+            pButtonBox->addButton(&rButton, QDialogButtonBox::NoRole);
+        }
     }
 }