diff --git a/src/menu/columnar_menu.rs b/src/menu/columnar_menu.rs
index b30ce36..0b2d7bc 100644
--- a/src/menu/columnar_menu.rs
+++ b/src/menu/columnar_menu.rs
@@ -543,7 +543,7 @@ impl Menu for ColumnarMenu {
             // editing a multiline buffer.
             // Also, by replacing the new line character with a space, the insert
             // position is maintain in the line buffer.
-            let trimmed_buffer = editor.get_buffer().replace('\n', " ");
+            let trimmed_buffer = editor.get_buffer().replace("\r\n", "  ").replace('\n', " ");
             completer.complete(
                 &trimmed_buffer[..editor.insertion_point()],
                 editor.insertion_point(),
diff --git a/src/menu/ide_menu.rs b/src/menu/ide_menu.rs
index 2b1ea47..12ef2ae 100644
--- a/src/menu/ide_menu.rs
+++ b/src/menu/ide_menu.rs
@@ -679,7 +679,7 @@ impl Menu for IdeMenu {
             // editing a multiline buffer.
             // Also, by replacing the new line character with a space, the insert
             // position is maintain in the line buffer.
-            let trimmed_buffer = editor.get_buffer().replace('\n', " ");
+            let trimmed_buffer = editor.get_buffer().replace("\r\n", "  ").replace('\n', " ");
             completer.complete(
                 &trimmed_buffer[..editor.insertion_point()],
                 editor.insertion_point(),