diff --git a/ext/native/ui/viewgroup.cpp b/ext/native/ui/viewgroup.cpp
index 52effb0861..eb3a2bf575 100644
--- a/ext/native/ui/viewgroup.cpp
+++ b/ext/native/ui/viewgroup.cpp
@@ -1293,7 +1293,7 @@ void ListView::CreateAllItems() {
 	// Let's not be clever yet, we'll just create them all up front and add them all in.
 	for (int i = 0; i < adaptor_->GetNumItems(); i++) {
 		if (hidden_.find(i) == hidden_.end()) {
-			View * v = linLayout_->Add(adaptor_->CreateItemView(i));
+			View *v = linLayout_->Add(adaptor_->CreateItemView(i));
 			adaptor_->AddEventCallback(v, std::bind(&ListView::OnItemCallback, this, i, std::placeholders::_1));
 		}
 	}
@@ -1315,7 +1315,7 @@ EventReturn ListView::OnItemCallback(int num, EventParams &e) {
 	OnChoice.Trigger(ev);
 	CreateAllItems();
 	if (focused)
-		SetFocusedView(linLayout_->GetViewByIndex(num));
+		SetFocusedView(e.v);
 	return EVENT_DONE;
 }