diff --git a/src/bin/client.rs b/src/bin/client.rs
index dcfad12..70c473a 100644
--- a/src/bin/client.rs
+++ b/src/bin/client.rs
@@ -327,7 +327,7 @@ fn start_display_thread(request_recv: Receiver<DisplayMessage>) {
                     stdout,
                     "{}{}",
                     termion::cursor::Left(1),
-                    termion::clear::AfterCursor
+                    termion::clear::UntilNewline
                 )
                 .unwrap(),
                 DisplayMessage::Help => print_help(&mut stdout),
@@ -417,10 +417,12 @@ fn start_keyboard_input_thread(
                     }
                 }
                 Event::Key(Key::Backspace) => {
-                    buffer.pop();
-                    display_sender
-                        .send(DisplayMessage::RemoveLastInput)
-                        .unwrap();
+                    if buffer.len() > 0 {
+                        buffer.pop();
+                        display_sender
+                            .send(DisplayMessage::RemoveLastInput)
+                            .unwrap();
+                    }
                 }
                 Event::Key(_) => continue,
                 Event::Mouse(_) => continue,