diff --git a/src/chat.c b/src/chat.c
index 2921690..8d9e7bb 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -228,6 +228,8 @@ static void chat_onFileSendRequest(ToxWindow *self, Tox *m, int32_t num, uint8_t
     uint8_t msg[MAX_STR_SIZE];
     uint8_t *errmsg;
 
+    pathname[path_len] = '\0';
+
     uint8_t filename[MAX_STR_SIZE];
     get_file_name(pathname, filename);
 
diff --git a/src/chat_commands.c b/src/chat_commands.c
index 92b076a..afbbe27 100644
--- a/src/chat_commands.c
+++ b/src/chat_commands.c
@@ -247,7 +247,7 @@ void cmd_sendfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
 
     uint8_t filename[MAX_STR_SIZE];
     get_file_name(path, filename);
-    int filenum = tox_new_file_sender(m, self->num, filesize, filename, strlen(filename) + 1);
+    int filenum = tox_new_file_sender(m, self->num, filesize, filename, strlen(filename));
 
     if (filenum == -1) {
         errmsg = "Error sending file.";