diff --git a/onionshare_gui/settings_dialog.py b/onionshare_gui/settings_dialog.py
index 856ca993..2897b944 100644
--- a/onionshare_gui/settings_dialog.py
+++ b/onionshare_gui/settings_dialog.py
@@ -62,6 +62,12 @@ class SettingsDialog(QtWidgets.QDialog):
         use_legacy_v2_onions_label.setWordWrap(True)
         use_legacy_v2_onions_label.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction)
         use_legacy_v2_onions_label.setOpenExternalLinks(True)
+        use_legacy_v2_onions_layout = QtWidgets.QHBoxLayout()
+        use_legacy_v2_onions_layout.addWidget(self.use_legacy_v2_onions_checkbox)
+        use_legacy_v2_onions_layout.addWidget(use_legacy_v2_onions_label)
+        use_legacy_v2_onions_layout.addStretch()
+        use_legacy_v2_onions_widget = QtWidgets.QWidget()
+        use_legacy_v2_onions_widget.setLayout(use_legacy_v2_onions_layout)
 
         # Whether or not to save the Onion private key for reuse (persistent URL mode)
         self.save_private_key_checkbox = QtWidgets.QCheckBox()
@@ -79,11 +85,18 @@ class SettingsDialog(QtWidgets.QDialog):
         self.stealth_checkbox.setCheckState(QtCore.Qt.Unchecked)
         self.stealth_checkbox.setText(strings._("gui_settings_stealth_option", True))
         self.stealth_checkbox.clicked.connect(self.stealth_checkbox_clicked_connect)
-        stealth_details = QtWidgets.QLabel(strings._("gui_settings_stealth_option_details", True))
-        stealth_details.setWordWrap(True)
-        stealth_details.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction)
-        stealth_details.setOpenExternalLinks(True)
-        stealth_details.setMinimumSize(stealth_details.sizeHint())
+        use_stealth_label = QtWidgets.QLabel(strings._("gui_settings_stealth_option_details", True))
+        use_stealth_label.setWordWrap(True)
+        use_stealth_label.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction)
+        use_stealth_label.setOpenExternalLinks(True)
+        use_stealth_label.setMinimumSize(use_stealth_label.sizeHint())
+
+        use_stealth_layout = QtWidgets.QHBoxLayout()
+        use_stealth_layout.addWidget(self.stealth_checkbox)
+        use_stealth_layout.addWidget(use_stealth_label)
+        use_stealth_layout.addStretch()
+        use_stealth_widget = QtWidgets.QWidget()
+        use_stealth_widget.setLayout(use_stealth_layout)
 
         hidservauth_details = QtWidgets.QLabel(strings._('gui_settings_stealth_hidservauth_string', True))
         hidservauth_details.setWordWrap(True)
@@ -96,12 +109,10 @@ class SettingsDialog(QtWidgets.QDialog):
 
         # General options layout
         general_group_layout = QtWidgets.QVBoxLayout()
-        general_group_layout.addWidget(self.use_legacy_v2_onions_checkbox)
-        general_group_layout.addWidget(use_legacy_v2_onions_label)
+        general_group_layout.addWidget(use_legacy_v2_onions_widget)
         general_group_layout.addWidget(self.save_private_key_checkbox)
         general_group_layout.addWidget(self.public_mode_checkbox)
-        general_group_layout.addWidget(self.stealth_checkbox)
-        general_group_layout.addWidget(stealth_details)
+        general_group_layout.addWidget(use_stealth_widget)
         general_group_layout.addWidget(hidservauth_details)
         general_group_layout.addWidget(self.hidservauth_copy_button)