diff --git a/src/chat.c b/src/chat.c
index ad8dcb5..12cc635 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -385,7 +385,7 @@ static void chat_onFileData(ToxWindow *self, Tox *m, int32_t num, uint8_t filenu
     FILE *fp = friends[num].file_receiver.files[filenum];
 
     if (fp) {
-        if (fwrite(data, length, 1, friends[num].file_receiver.files[filenum]) != 1) {
+        if (fwrite(data, length, 1, fp) != 1) {
             uint8_t *msg = " * Error writing to file.";
             line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, RED);
 
diff --git a/src/file_senders.c b/src/file_senders.c
index 45dcd4f..c1051ba 100644
--- a/src/file_senders.c
+++ b/src/file_senders.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
@@ -35,17 +34,8 @@
 FileSender file_senders[MAX_FILES];
 uint8_t max_file_senders_index;
 
-static void close_file_sender(ToxWindow *self, Tox *m, int i, uint8_t *msg, int CTRL, int filenum, int32_t friendnum)
+static void set_max_file_senders_index(void)
 {
-    if (self->chatwin != NULL) {
-        line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, 0);
-        alert_window(file_senders[i].toxwin, WINDOW_ALERT_2, true);
-    }
-
-    tox_file_send_control(m, friendnum, 0, filenum, CTRL, 0, 0);
-    fclose(file_senders[i].file);
-    memset(&file_senders[i], 0, sizeof(FileSender));
-
     int j;
 
     for (j = max_file_senders_index; j > 0; --j) {
@@ -56,14 +46,32 @@ static void close_file_sender(ToxWindow *self, Tox *m, int i, uint8_t *msg, int
     max_file_senders_index = j;
 }
 
-/* Should only be called on exit */
-void close_all_file_senders(void)
+static void close_file_sender(ToxWindow *self, Tox *m, int i, uint8_t *msg, int CTRL, int filenum, int32_t friendnum)
+{
+    if (self->chatwin != NULL) {
+        line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, 0);
+        alert_window(file_senders[i].toxwin, WINDOW_ALERT_2, true);
+    }
+
+    tox_file_send_control(m, friendnum, 0, filenum, CTRL, 0, 0);
+    fclose(file_senders[i].file);
+    memset(&file_senders[i], 0, sizeof(FileSender));
+    set_max_file_senders_index();
+}
+
+void close_all_file_senders(Tox *m)
 {
     int i;
 
     for (i = 0; i < max_file_senders_index; ++i) {
-        if (file_senders[i].active)
+        if (file_senders[i].active) {
             fclose(file_senders[i].file);
+            tox_file_send_control(m, file_senders[i].friendnum, 0, file_senders[i].filenum,
+                                  TOX_FILECONTROL_KILL, 0, 0);
+            memset(&file_senders[i], 0, sizeof(FileSender));
+        }
+
+        set_max_file_senders_index();
     }
 }
 
diff --git a/src/file_senders.h b/src/file_senders.h
index a5ccc5f..76ae6d0 100644
--- a/src/file_senders.h
+++ b/src/file_senders.h
@@ -44,9 +44,7 @@ typedef struct {
     uint32_t line_id;
 } FileSender;
 
-/* Should only be called on exit */
-void close_all_file_senders(void);
-
+void close_all_file_senders(Tox *m);
 void do_file_senders(Tox *m);
 
 #endif  /* #define _filesenders_h */
diff --git a/src/toxic.c b/src/toxic.c
index dfcfffe..b7c5e65 100644
--- a/src/toxic.c
+++ b/src/toxic.c
@@ -95,7 +95,10 @@ static void ignore_SIGINT(int sig)
 void exit_toxic_success(Tox *m)
 {
     store_data(m, DATA_FILE);
-    close_all_file_senders();
+
+    close_all_file_senders(m);
+    usleep(1000);
+
     kill_all_windows();
     log_disable(prompt->chatwin->log);
     line_info_cleanup(prompt->chatwin->hst);