diff --git a/src/shared/help/topicchooser.cpp b/src/shared/help/topicchooser.cpp
index 6b24ab5f38b..b7e5db7f3fe 100644
--- a/src/shared/help/topicchooser.cpp
+++ b/src/shared/help/topicchooser.cpp
@@ -64,9 +64,9 @@ TopicChooser::TopicChooser(QWidget *parent, const QString &keyword,
     if (m_filterModel->rowCount() != 0)
         ui.listWidget->setCurrentIndex(m_filterModel->index(0, 0));
 
-    connect(ui.buttonDisplay, &QPushButton::clicked,
+    connect(ui.buttonBox, &QDialogButtonBox::accepted,
             this, &TopicChooser::acceptDialog);
-    connect(ui.buttonCancel, &QPushButton::clicked,
+    connect(ui.buttonBox, &QDialogButtonBox::rejected,
             this, &TopicChooser::reject);
     connect(ui.listWidget, &QListView::activated,
             this, &TopicChooser::activated);
diff --git a/src/shared/help/topicchooser.ui b/src/shared/help/topicchooser.ui
index 57ab39b3945..b288f8334c3 100644
--- a/src/shared/help/topicchooser.ui
+++ b/src/shared/help/topicchooser.ui
@@ -34,53 +34,11 @@
     <widget class="QListView" name="listWidget"/>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="unnamed">
-     <property name="spacing">
-      <number>6</number>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
-     <item>
-      <spacer name="Horizontal Spacing2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonDisplay">
-       <property name="text">
-        <string>&amp;Display</string>
-       </property>
-       <property name="autoDefault">
-        <bool>true</bool>
-       </property>
-       <property name="default">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonCancel">
-       <property name="text">
-        <string>&amp;Close</string>
-       </property>
-       <property name="autoDefault">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    </widget>
    </item>
   </layout>
  </widget>