diff --git a/exec/avatar_chooser.js b/exec/avatar_chooser.js
index 4c1190aaa205486d7809340e53989f0e4ce84e1b..6c90746017e23ae50f0b87d45b66c3fc40d85218 100644
--- a/exec/avatar_chooser.js
+++ b/exec/avatar_chooser.js
@@ -263,6 +263,18 @@ function CollectionBrowser(filename, parent_frame) {
 					highlight();
 				}
 				break;
+            case KEY_HOME:
+                if (state.selected > 0) {
+                    state.selected = 0;
+                    highlight();
+                }
+                break;
+            case KEY_END:
+                if (state.selected < collection.count - 1) {
+                    state.selected = collection.count - 1;
+                    highlight();
+                }
+                break;
 			case '\r':
 			case '\n':
 				flashy_flashy();