diff --git a/src/text_editor/commands_window.cpp b/src/text_editor/commands_window.cpp
index b160306..31a1a0c 100644
--- a/src/text_editor/commands_window.cpp
+++ b/src/text_editor/commands_window.cpp
@@ -288,8 +288,8 @@ void ReplaceInfobarData() {
 
     String16 buffer_string = GetString(*buffer);
     Range    replace_range = {0, buffer->len};
-    if (!Seek(buffer_string, L"|", &replace_range.max)) {
-        // ReplaceText(buffer, GetEndAsRange(*buffer), L"|");
+    if (!Seek(buffer_string, L" |", &replace_range.max)) {
+        ReplaceText(buffer, GetEndAsRange(*buffer), L" |");
     }
 
     const char *dirty = "";
diff --git a/src/text_editor/window_draw.cpp b/src/text_editor/window_draw.cpp
index eeb2452..a31de77 100644
--- a/src/text_editor/window_draw.cpp
+++ b/src/text_editor/window_draw.cpp
@@ -97,7 +97,9 @@ void DrawWindow(Window *window) {
 
     DrawRect(window->total_rect, ColorBackground);
 
-    SetScissor(window->document_rect);
+    Rect2I combined_document_line_number = window->document_rect;
+    if (window->draw_line_numbers) combined_document_line_number.min.x = window->line_numbers_rect.min.x;
+    SetScissor(combined_document_line_number);
     BeginProfileScope(draw_caret_selection);
     Rect2I visible = GetVisibleCells(window);
     For(view->carets) {
@@ -166,7 +168,6 @@ void DrawWindow(Window *window) {
     // Draw line numbers
     if (window->draw_line_numbers) {
         SetScissor(window->line_numbers_rect);
-        DrawRect(window->line_numbers_rect, ColorBackground);
 
         Rect2I vlines = GetVisibleCells(window);
         for (Int line = vlines.min.y; line <= vlines.max.y; line += 1) {