diff --git a/custom/4coder_lister_base.cpp b/custom/4coder_lister_base.cpp
index 05c39b2b..c67a0361 100644
--- a/custom/4coder_lister_base.cpp
+++ b/custom/4coder_lister_base.cpp
@@ -295,6 +295,9 @@ lister_render(Application_Links *app, Frame_Info frame_info, View_ID view){
     i32 first_index = (i32)(scroll_y/block_height);
     y_pos += first_index*block_height;
     
+    i32 max_count = first_index + lister->visible_count + 3;
+    count = clamp_to(lister->filtered.count, max_count);
+    
     for (i32 i = first_index; i < count; i += 1){
         Lister_Node *node = lister->filtered.node_ptrs[i];