diff --git a/src/buffer/channel.rs b/src/buffer/channel.rs
index 156ff564e..09e392cc8 100644
--- a/src/buffer/channel.rs
+++ b/src/buffer/channel.rs
@@ -68,12 +68,20 @@ pub fn view<'a>(
                             }
                             _ => theme::Container::Default,
                         };
-                        let message = selectable_text(format!(" {}", message.text));
+
+                        let space = selectable_text(" ");
+                        let message = selectable_text(&message.text);
 
                         Some(
-                            container(row![].push_maybe(timestamp).push(nick).push(message))
-                                .style(row_style)
-                                .into(),
+                            container(
+                                row![]
+                                    .push_maybe(timestamp)
+                                    .push(nick)
+                                    .push(space)
+                                    .push(message),
+                            )
+                            .style(row_style)
+                            .into(),
                         )
                     }
                     message::Source::Server(_) => {
diff --git a/src/buffer/query.rs b/src/buffer/query.rs
index 2f84fd89b..87c96093f 100644
--- a/src/buffer/query.rs
+++ b/src/buffer/query.rs
@@ -54,10 +54,18 @@ pub fn view<'a>(
                         )
                         .map(scroll_view::Message::UserContext);
 
-                        let message = selectable_text(format!(" {}", message.text));
+                        let space = selectable_text(" ");
+                        let message = selectable_text(&message.text);
 
                         Some(
-                            container(row![].push_maybe(timestamp).push(nick).push(message)).into(),
+                            container(
+                                row![]
+                                    .push_maybe(timestamp)
+                                    .push(nick)
+                                    .push(space)
+                                    .push(message),
+                            )
+                            .into(),
                         )
                     }
                     message::Source::Server(_) => {