diff --git a/CHANGELOG.md b/CHANGELOG.md
index 809cc413..8a4420ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   * Undo edtis in a `TextEdit`.
   * You can now check if a `TextEdit` lost keyboard focus with `response.lost_kb_focus`.
   * Added `ui.text_edit_singleline` and `ui.text_edit_multiline`.
+* You can now debug why your `Ui` is unexpectedly wide with `ui.style_mut().visuals.debug_expand_width = true;`
 
 ### Changed 🔧
 
@@ -22,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Improved automatic `Id` generation, making `Id` clashes less likely.
 * Egui now requires modifier key state from the integration
 * Added, renamed and removed some keys in the `Key` enum.
+* Fixed incorrect text wrapping width on radio buttons
 
 ### Fixed 🐛
 
diff --git a/egui/src/widgets/mod.rs b/egui/src/widgets/mod.rs
index 4006324d..9cb15ef0 100644
--- a/egui/src/widgets/mod.rs
+++ b/egui/src/widgets/mod.rs
@@ -380,14 +380,17 @@ impl<'a> Widget for Checkbox<'a> {
 
         let text_style = TextStyle::Button;
         let font = &ui.fonts()[text_style];
-        let galley = font.layout_single_line(text);
 
         let spacing = &ui.style().spacing;
         let icon_width = spacing.icon_width;
         let icon_spacing = ui.style().spacing.icon_spacing;
         let button_padding = spacing.button_padding;
-        let mut desired_size =
-            button_padding + vec2(icon_width + icon_spacing, 0.0) + galley.size + button_padding;
+        let total_extra = button_padding + vec2(icon_width + icon_spacing, 0.0) + button_padding;
+
+        let galley = font.layout_single_line(text);
+        // let galley = font.layout_multiline(text, ui.available().width() - total_extra.x);
+
+        let mut desired_size = total_extra + galley.size;
         desired_size = desired_size.at_least(spacing.interact_size);
         desired_size.y = desired_size.y.max(icon_width);
         let rect = ui.allocate_space(desired_size);
@@ -464,15 +467,18 @@ impl Widget for RadioButton {
             text,
             text_color,
         } = self;
+
         let text_style = TextStyle::Button;
         let font = &ui.fonts()[text_style];
-        let galley = font.layout_multiline(text, ui.available().width());
 
         let icon_width = ui.style().spacing.icon_width;
         let icon_spacing = ui.style().spacing.icon_spacing;
         let button_padding = ui.style().spacing.button_padding;
-        let mut desired_size =
-            button_padding + vec2(icon_width + icon_spacing, 0.0) + galley.size + button_padding;
+        let total_extra = button_padding + vec2(icon_width + icon_spacing, 0.0) + button_padding;
+
+        let galley = font.layout_multiline(text, ui.available().width() - total_extra.x);
+
+        let mut desired_size = total_extra + galley.size;
         desired_size = desired_size.at_least(ui.style().spacing.interact_size);
         desired_size.y = desired_size.y.max(icon_width);
         let rect = ui.allocate_space(desired_size);