diff --git a/src/windows/editor_object_selection.c b/src/windows/editor_object_selection.c
index 1014374fc3..4919767f3c 100644
--- a/src/windows/editor_object_selection.c
+++ b/src/windows/editor_object_selection.c
@@ -360,6 +360,9 @@ static void window_editor_object_selection_mouseup()
 		break;
 	case WIDX_FILTER_CLEAR_BUTTON:
 		memset(_filter_string, 0, sizeof(_filter_string));
+
+		w->scrolls->v_top = 0;
+
 		window_invalidate(w);
 		break;
 	}
@@ -1051,6 +1054,10 @@ static void window_editor_object_selection_textinput()
 	}
 
 	filter_update_counts();
+
+	w->scrolls->v_top = 0;
+
+	window_invalidate(w);
 }
 
 static bool filter_string(rct_object_entry *entry)