diff --git a/src/gui/gui-keyboard.c b/src/gui/gui-keyboard.c
index 57bad1c10..de5120ac4 100644
--- a/src/gui/gui-keyboard.c
+++ b/src/gui/gui-keyboard.c
@@ -760,7 +760,9 @@ gui_keyboard_buffer_add (int key)
     if (gui_keyboard_buffer)
     {
         gui_keyboard_buffer[gui_keyboard_buffer_size - 1] = key;
-        if (key == 10)
+        if ((key == 10)
+            && (gui_keyboard_buffer_size > 1)
+            && (gui_keyboard_buffer[gui_keyboard_buffer_size - 2] != 10))
             gui_keyboard_paste_lines++;
     }
     else