diff --git a/beeref/widgets/__init__.py b/beeref/widgets/__init__.py
index 4ad9cf2..41183e8 100644
--- a/beeref/widgets/__init__.py
+++ b/beeref/widgets/__init__.py
@@ -192,6 +192,13 @@ class HelpDialog(QtWidgets.QDialog):
         layout = QtWidgets.QVBoxLayout()
         self.setLayout(layout)
         layout.addWidget(tabs)
+
+        # Bottom row of buttons
+        buttons = QtWidgets.QDialogButtonBox(
+            QtWidgets.QDialogButtonBox.StandardButton.Close)
+        buttons.rejected.connect(self.reject)
+        layout.addWidget(buttons)
+
         self.show()
 
 
diff --git a/beeref/widgets/settings.py b/beeref/widgets/settings.py
index 68fb6ab..2037ced 100644
--- a/beeref/widgets/settings.py
+++ b/beeref/widgets/settings.py
@@ -105,25 +105,18 @@ class SettingsDialog(QtWidgets.QDialog):
         layout.addWidget(tabs)
 
         # Bottom row of buttons
-        buttons = QtWidgets.QDialogButtonBox()
+        buttons = QtWidgets.QDialogButtonBox(
+            QtWidgets.QDialogButtonBox.StandardButton.Close)
+        buttons.rejected.connect(self.reject)
         reset_btn = QtWidgets.QPushButton('&Restore Defaults')
         reset_btn.setAutoDefault(False)
         reset_btn.clicked.connect(self.on_restore_defaults)
         buttons.addButton(reset_btn,
                           QtWidgets.QDialogButtonBox.ButtonRole.ActionRole)
 
-        close_btn = QtWidgets.QPushButton('&Close')
-        close_btn.setAutoDefault(True)
-        close_btn.clicked.connect(self.on_close)
-        buttons.addButton(close_btn,
-                          QtWidgets.QDialogButtonBox.ButtonRole.ActionRole)
-
         layout.addWidget(buttons)
         self.show()
 
-    def on_close(self, *args, **kwargs):
-        self.close()
-
     def on_restore_defaults(self, *args, **kwargs):
         reply = QtWidgets.QMessageBox.question(
             self,