diff --git a/res/notes/testplan.md b/res/notes/testplan.md
index 5d6e1be4..b5d3be8f 100644
--- a/res/notes/testplan.md
+++ b/res/notes/testplan.md
@@ -1395,6 +1395,7 @@ Repeat for each list box:
     * Selects the last item.
 * Hold down the mouse button on the scrollbar's up arrow or down arrow; verify that the scrolling continues as long as the button is held down.
 * Click on an item. Verify it is selected. Click on white space below the items (if possible). Verify that selection is cleared.
+* Hold the down arrow to scroll to the bottom of the list. Hold the up arrow to scroll to the top. Verify the correct items redraw.
 
 For the Sounds DA:
 * Click on an item. Verify it is selected, and plays the sound. Click on the same selected item. Verify it plays the sound again.
diff --git a/toolkits/lbtk.s b/toolkits/lbtk.s
index 72bc833d..3580a022 100644
--- a/toolkits/lbtk.s
+++ b/toolkits/lbtk.s
@@ -710,8 +710,6 @@ update:
         lda     lbr_copy + LBTK::ListBoxRecord::num_items
         beq     finish
 
-        index := tmp_point + .sizeof(MGTK::Point)
-
         lda     lbr_copy + LBTK::ListBoxRecord::num_rows
         sta     rows
         ldy     #MGTK::Winfo::vthumbpos
@@ -725,7 +723,8 @@ update:
 loop:
         MGTK_CALL MGTK::MoveTo, tmp_point
 
-        lda     index
+        index := *+1
+        lda     #SELF_MODIFIED_BYTE
         ldxy    #tmp_point
         jsr     DrawEntryProc