diff --git a/4ed_file_view.cpp b/4ed_file_view.cpp
index 82df77f0..5b64725e 100644
--- a/4ed_file_view.cpp
+++ b/4ed_file_view.cpp
@@ -3890,7 +3890,7 @@ step_file_view(System_Functions *system, View *view, View *active_view, Input_Su
                     id.id[1] = VUI_Interactive + ((u64)view->interaction << 32);
                                         
                     GUI_id scroll_context = {0};
-                    scroll_context.id[1] = VUI_Theme + ((u64)view->color_mode << 32);
+                    scroll_context.id[1] = VUI_Interactive + ((u64)view->interaction << 32);
 
                     switch (view->interaction){
                         case IInt_Sys_File_List:
diff --git a/buffer/4coder_buffer_abstract.cpp b/buffer/4coder_buffer_abstract.cpp
index c1e67dbc..32ab27f9 100644
--- a/buffer/4coder_buffer_abstract.cpp
+++ b/buffer/4coder_buffer_abstract.cpp
@@ -1356,7 +1356,7 @@ buffer_get_render_data(Buffer_Type *buffer, Buffer_Render_Item *items, int max,
                 ch = data[i];
                 ch_width = measure_character(advance_data, ch);
             
-                if (ch_width + x > width + shift_x && wrapped){
+                if (ch_width + x > width + shift_x && wrapped && ch != '\n'){
                     x = shift_x;
                     y += font_height;
                 }