diff --git a/CHANGELOG.md b/CHANGELOG.md
index d936c33..db875d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Improved editor key bindings
 - Slowed down room history download speed
 
+### Fixed
+- Spacing in some popups
+
 ## v0.1.0 - 2022-08-06
 
 Initial release
diff --git a/src/ui/room.rs b/src/ui/room.rs
index 72bdd0d..615d2f6 100644
--- a/src/ui/room.rs
+++ b/src/ui/room.rs
@@ -119,16 +119,16 @@ impl EuphRoom {
             State::Normal => chat,
             State::ChooseNick(ed) => Layer::new(vec![
                 chat,
-                Float::new(Border::new(Background::new(
-                    Padding::new(VJoin::new(vec![
-                        Segment::new(Text::new("Choose nick ")),
-                        Segment::new(
+                Float::new(Border::new(Background::new(VJoin::new(vec![
+                    Segment::new(Padding::new(Text::new("Choose nick")).horizontal(1)),
+                    Segment::new(
+                        Padding::new(
                             ed.widget()
                                 .highlight(|s| Styled::new(s, euph::nick_style(s))),
-                        ),
-                    ]))
-                    .left(1),
-                )))
+                        )
+                        .left(1),
+                    ),
+                ]))))
                 .horizontal(0.5)
                 .vertical(0.5)
                 .into(),
diff --git a/src/ui/rooms.rs b/src/ui/rooms.rs
index e73d625..b2890af 100644
--- a/src/ui/rooms.rs
+++ b/src/ui/rooms.rs
@@ -103,16 +103,16 @@ impl Rooms {
                 let room_style = ContentStyle::default().bold().blue();
                 Layer::new(vec![
                     self.rooms_widget().await,
-                    Float::new(Border::new(Background::new(
-                        Padding::new(VJoin::new(vec![
-                            Segment::new(Text::new("Connect to ")),
-                            Segment::new(HJoin::new(vec![
+                    Float::new(Border::new(Background::new(VJoin::new(vec![
+                        Segment::new(Padding::new(Text::new("Connect to")).horizontal(1)),
+                        Segment::new(
+                            Padding::new(HJoin::new(vec![
                                 Segment::new(Text::new(("&", room_style))),
                                 Segment::new(ed.widget().highlight(|s| Styled::new(s, room_style))),
-                            ])),
-                        ]))
-                        .left(1),
-                    )))
+                            ]))
+                            .left(1),
+                        ),
+                    ]))))
                     .horizontal(0.5)
                     .vertical(0.5)
                     .into(),