diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c
index 31d347a25..d9cf8b988 100644
--- a/src/gui/curses/gui-display.c
+++ b/src/gui/curses/gui-display.c
@@ -1655,7 +1655,12 @@ gui_end ()
             delwin (ptr_win->win_infobar);
         if (ptr_win->win_input)
             delwin (ptr_win->win_input);
-        /* TODO: free input buffer, lines, messages, completion */
+    }
+    
+    /* delete all buffers */
+    while (gui_buffers)
+    {
+        gui_buffer_free (gui_buffers, 0);
     }
     
     /* end of curses output */
diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c
index 31d347a25..d9cf8b988 100644
--- a/weechat/src/gui/curses/gui-display.c
+++ b/weechat/src/gui/curses/gui-display.c
@@ -1655,7 +1655,12 @@ gui_end ()
             delwin (ptr_win->win_infobar);
         if (ptr_win->win_input)
             delwin (ptr_win->win_input);
-        /* TODO: free input buffer, lines, messages, completion */
+    }
+    
+    /* delete all buffers */
+    while (gui_buffers)
+    {
+        gui_buffer_free (gui_buffers, 0);
     }
     
     /* end of curses output */