diff --git a/crates/gpui/src/elements/constrained_box.rs b/crates/gpui/src/elements/constrained_box.rs
index 2e232c6197774861fd14a453e62a8efb5772ee53..e4d51f5730be1bfa190ac7f2a7aa9e5e49b630e9 100644
--- a/crates/gpui/src/elements/constrained_box.rs
+++ b/crates/gpui/src/elements/constrained_box.rs
@@ -153,7 +153,9 @@ impl Element for ConstrainedBox {
         _: &mut Self::LayoutState,
         cx: &mut PaintContext,
     ) -> Self::PaintState {
-        self.child.paint(bounds.origin(), visible_bounds, cx);
+        cx.paint_layer(Some(visible_bounds), |cx| {
+            self.child.paint(bounds.origin(), visible_bounds, cx);
+        })
     }
 
     fn rect_for_text_range(
diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
index e4d062d575aa6a44909d0a757c766470987abb87..fe4b75dbefae3abfe21db7bc1c48ad1bda6f9e6c 100644
--- a/crates/picker/src/picker.rs
+++ b/crates/picker/src/picker.rs
@@ -102,7 +102,10 @@ impl<D: PickerDelegate> View for Picker<D> {
                                         .read(cx)
                                         .render_match(ix, state, ix == selected_ix, cx)
                                 })
-                                .on_down(MouseButton::Left, move |_, cx| {
+                                // Capture mouse events
+                                .on_down(MouseButton::Left, |_, _| {})
+                                .on_up(MouseButton::Left, |_, _| {})
+                                .on_click(MouseButton::Left, move |_, cx| {
                                     cx.dispatch_action(SelectIndex(ix))
                                 })
                                 .with_cursor_style(CursorStyle::PointingHand)
diff --git a/crates/theme_selector/src/theme_selector.rs b/crates/theme_selector/src/theme_selector.rs
index d999730a0d8b7abe21c0d9b39bfc3a9fb4ca49ca..0930bf0484e9a28880035c058ff2238c53324c5f 100644
--- a/crates/theme_selector/src/theme_selector.rs
+++ b/crates/theme_selector/src/theme_selector.rs
@@ -50,7 +50,6 @@ impl ThemeSelector {
         theme_names.sort_unstable_by(|a, b| {
             a.is_light
                 .cmp(&b.is_light)
-                .reverse()
                 .then(a.name.cmp(&b.name))
         });
         let matches = theme_names
diff --git a/crates/welcome/src/welcome.rs b/crates/welcome/src/welcome.rs
index c6316c61d50264c74ad4f9da6847d89c9342643a..dc864a3ad17db2e7856eb8fa0174ccce724eb836 100644
--- a/crates/welcome/src/welcome.rs
+++ b/crates/welcome/src/welcome.rs
@@ -84,6 +84,7 @@ impl View for WelcomePage {
                 ])
                 .constrained()
                 .with_max_width(width)
+                .contained().with_uniform_padding(10.)
                 .aligned()
                 .boxed(),
         )
@@ -126,7 +127,7 @@ impl WelcomePage {
                 .contained()
                 .with_style(style.container)
                 .constrained()
-                .with_width(width)
+                .with_max_width(width)
                 .boxed()
         })
         .on_click(MouseButton::Left, move |_, cx| {