diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8e14605..6755c0f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@
   pop-up web dialog to avoid taking users out of the app. This currently works
   on the native (not cmake) Mac build but will probably expand to others in the
   future.
-- The `ba*.app.env.version` `and ba*.app.env.build_number` values are now
+- The `ba*.app.env.version` and `ba*.app.env.build_number` values are now
   `ba*.app.env.engine_version` and `ba*.app.env.engine_build_number`. At this
   point any functionality that cares about versions should be looking at engine
   version anyway. In the future we can add separate `app_version` and
diff --git a/src/assets/ba_data/python/bauiv1lib/settings/plugins.py b/src/assets/ba_data/python/bauiv1lib/settings/plugins.py
index bcece4e6..c9fec166 100644
--- a/src/assets/ba_data/python/bauiv1lib/settings/plugins.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/plugins.py
@@ -388,7 +388,10 @@ class PluginWindow(bui.Window):
                     edit=check,
                     up_widget=self._back_button,
                     left_widget=self._back_button,
-                    right_widget=self._settings_button,
+                    right_widget=(
+                        self._settings_button if button is None else
+                        button
+                    ),
                 )
                 if button is not None:
                     bui.widget(edit=button, up_widget=self._back_button)