Index: uspace/lib/ui/src/filelist.c
===================================================================
--- uspace/lib/ui/src/filelist.c	(revision 03fc3a9bf3639c419bd0eab4618ffe992633e9c8)
+++ uspace/lib/ui/src/filelist.c	(revision fdf55a3c204ba982dec2e1272d1633955a396f19)
@@ -934,6 +934,4 @@
 /** Find the n-th entry of the current file list page.
  *
- * If the page is short and has less than n+1 entries, return the last entry.
- *
  * @param flist File list
  * @param n Which entry to get (starting from 0)
@@ -945,5 +943,4 @@
 {
 	ui_file_list_entry_t *entry;
-	ui_file_list_entry_t *next;
 	size_t i;
 	size_t idx;
@@ -957,9 +954,8 @@
 	idx = flist->page_idx;
 	for (i = 0; i < n; i++) {
-		next = ui_file_list_next(entry);
-		if (next == NULL)
-			break;
-
-		entry = next;
+		entry = ui_file_list_next(entry);
+		if (entry == NULL)
+			return NULL;
+
 		++idx;
 	}
Index: uspace/lib/ui/test/filelist.c
===================================================================
--- uspace/lib/ui/test/filelist.c	(revision 03fc3a9bf3639c419bd0eab4618ffe992633e9c8)
+++ uspace/lib/ui/test/filelist.c	(revision fdf55a3c204ba982dec2e1272d1633955a396f19)
@@ -283,14 +283,4 @@
 	PCUT_ASSERT_INT_EQUALS(2, flist->cursor->size);
 
-	/* Clicking below the last entry should select it */
-	event.hpos = 20;
-	event.vpos = 200;
-	claimed = ui_file_list_pos_event(flist, &event);
-	PCUT_ASSERT_EQUALS(ui_claimed, claimed);
-
-	PCUT_ASSERT_NOT_NULL(flist->cursor);
-	PCUT_ASSERT_STR_EQUALS("c", flist->cursor->name);
-	PCUT_ASSERT_INT_EQUALS(3, flist->cursor->size);
-
 	/* Clicking on the top edge should do a page-up */
 	event.hpos = 20;
@@ -1014,18 +1004,15 @@
 
 	entry = ui_file_list_page_nth_entry(flist, 0, &idx);
+	PCUT_ASSERT_NOT_NULL(entry);
 	PCUT_ASSERT_STR_EQUALS("b", entry->name);
 	PCUT_ASSERT_INT_EQUALS(1, idx);
 
 	entry = ui_file_list_page_nth_entry(flist, 1, &idx);
+	PCUT_ASSERT_NOT_NULL(entry);
 	PCUT_ASSERT_STR_EQUALS("c", entry->name);
 	PCUT_ASSERT_INT_EQUALS(2, idx);
 
 	entry = ui_file_list_page_nth_entry(flist, 2, &idx);
-	PCUT_ASSERT_STR_EQUALS("c", entry->name);
-	PCUT_ASSERT_INT_EQUALS(2, idx);
-
-	entry = ui_file_list_page_nth_entry(flist, 3, &idx);
-	PCUT_ASSERT_STR_EQUALS("c", entry->name);
-	PCUT_ASSERT_INT_EQUALS(2, idx);
+	PCUT_ASSERT_NULL(entry);
 
 	ui_file_list_destroy(flist);