diff --git a/internal/system/event.go b/internal/system/event.go
index aa820b2..9699c53 100644
--- a/internal/system/event.go
+++ b/internal/system/event.go
@@ -33,13 +33,16 @@ func (this *Hierarchy) HandleKeyDown (key input.Key, numberPad bool) {
 		return true
 	})
 	if caught { return }
-	
-	if key == input.KeyTab {
+
+	switch key {
+	case input.KeyTab:
 		if this.modifiers.Shift {
 			this.focusPrevious()
 		} else {
 			this.focusNext()
 		}
+	case input.KeyUp:   this.focusPrevious()
+	case input.KeyDown: this.focusNext()
 	}
 }