diff --git a/src/global_commands.c b/src/global_commands.c
index 4a3d99b..b51adca 100644
--- a/src/global_commands.c
+++ b/src/global_commands.c
@@ -191,6 +191,13 @@ void cmd_add(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX
 void cmd_clear(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
     line_info_clear(self->chatwin->hst);
+    wclear(window);
+
+    if (self->is_prompt) {
+        int y2, x2;
+        getmaxyx(window, y2, x2);
+        wmove(self->chatwin->history, y2 - 1, 2);
+    }
 }
 
 void cmd_connect(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])