diff --git a/component/layout/layout.go b/component/layout/layout.go
index 569c270..f79cce9 100644
--- a/component/layout/layout.go
+++ b/component/layout/layout.go
@@ -232,35 +232,37 @@ func (l *Layout) moveSelection(direction string) {
 			previouslySelectedCornerPoint = component.GetRectLeftSideCenter(previouslySelected.GetRect())
 			newlySelectedCornerPoint = component.GetRectRightSideCenter(l.getComponent(newlySelectedIndex).GetRect())
 			currentCornerPoint = component.GetRectRightSideCenter(current.GetRect())
-			if currentCornerPoint.X > previouslySelectedCornerPoint.X {
-				continue
-			}
 		case console.KeyRight:
 			previouslySelectedCornerPoint = component.GetRectRightSideCenter(previouslySelected.GetRect())
 			newlySelectedCornerPoint = component.GetRectLeftSideCenter(l.getComponent(newlySelectedIndex).GetRect())
 			currentCornerPoint = component.GetRectLeftSideCenter(current.GetRect())
-			if currentCornerPoint.X < previouslySelectedCornerPoint.X {
-				continue
-			}
 		case console.KeyUp:
 			previouslySelectedCornerPoint = component.GetRectTopSideCenter(previouslySelected.GetRect())
 			newlySelectedCornerPoint = component.GetRectBottomSideCenter(l.getComponent(newlySelectedIndex).GetRect())
 			currentCornerPoint = component.GetRectBottomSideCenter(current.GetRect())
-			if currentCornerPoint.Y > previouslySelectedCornerPoint.Y {
-				continue
-			}
 		case console.KeyDown:
 			previouslySelectedCornerPoint = component.GetRectBottomSideCenter(previouslySelected.GetRect())
 			newlySelectedCornerPoint = component.GetRectTopSideCenter(l.getComponent(newlySelectedIndex).GetRect())
 			currentCornerPoint = component.GetRectTopSideCenter(current.GetRect())
-			if currentCornerPoint.Y < previouslySelectedCornerPoint.Y {
-				continue
-			}
 		}
 
-		if component.GetDistance(previouslySelectedCornerPoint, currentCornerPoint) <
-			component.GetDistance(previouslySelectedCornerPoint, newlySelectedCornerPoint) {
-			newlySelectedIndex = i
+		switch direction {
+		case console.KeyLeft:
+			fallthrough
+		case console.KeyRight:
+			if ui.AbsInt(currentCornerPoint.X-previouslySelectedCornerPoint.X) <= ui.AbsInt(newlySelectedCornerPoint.X-previouslySelectedCornerPoint.X) {
+				if ui.AbsInt(currentCornerPoint.Y-previouslySelectedCornerPoint.Y) <= ui.AbsInt(newlySelectedCornerPoint.Y-previouslySelectedCornerPoint.Y) {
+					newlySelectedIndex = i
+				}
+			}
+		case console.KeyUp:
+			fallthrough
+		case console.KeyDown:
+			if ui.AbsInt(currentCornerPoint.Y-previouslySelectedCornerPoint.Y) <= ui.AbsInt(newlySelectedCornerPoint.Y-previouslySelectedCornerPoint.Y) {
+				if ui.AbsInt(currentCornerPoint.X-previouslySelectedCornerPoint.X) <= ui.AbsInt(newlySelectedCornerPoint.X-previouslySelectedCornerPoint.X) {
+					newlySelectedIndex = i
+				}
+			}
 		}
 	}
 
diff --git a/component/menu.go b/component/menu.go
index a581783..ecc6e49 100644
--- a/component/menu.go
+++ b/component/menu.go
@@ -122,7 +122,7 @@ func (m *Menu) Draw(buffer *ui.Buffer) {
 
 func (m *Menu) renderHighlight(buffer *ui.Buffer) {
 
-	arrowsText := "Use mouse or arrows for selection"
+	arrowsText := "Use mouse or keyboard for selection"
 	optionsText := "<ENTER> to view options"
 	resumeText := "<ESC> to resume"