diff --git a/TODO b/TODO
index e51b1988..8293ed4b 100644
--- a/TODO
+++ b/TODO
@@ -90,4 +90,3 @@
 - document find-window
 - document split-window -p and -l
 - attach should have a flag to create session if it doesn't exist
-- fix page up/down in choice mode AGAIN
diff --git a/window-choose.c b/window-choose.c
index 026cc075..b8a06235 100644
--- a/window-choose.c
+++ b/window-choose.c
@@ -1,4 +1,4 @@
-/* $Id: window-choose.c,v 1.9 2009-01-28 22:00:22 nicm Exp $ */
+/* $Id: window-choose.c,v 1.10 2009-01-29 20:02:33 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -235,12 +235,10 @@ window_choose_key(struct window_pane *wp, unused struct client *c, int key)
 		if (data->selected > items - 1)
 			data->selected = items - 1;
 		data->top += screen_size_y(s);
-		if (data->top + screen_size_y(s) - 1 > data->selected) {
-			if (items < screen_size_y(s) - 1)
-				data->top = 0;
-			else
-				data->top = items - screen_size_y(s);
-		}
+		if (data->selected < data->top)
+			data->top = data->selected;
+		if (data->top + screen_size_y(s) > items)
+			data->top = items - screen_size_y(s);
 		window_choose_redraw_screen(wp);
 		break;
 	default: