diff --git a/ext/native/ui/ui_screen.h b/ext/native/ui/ui_screen.h
index cb894999f5..fee88ce255 100644
--- a/ext/native/ui/ui_screen.h
+++ b/ext/native/ui/ui_screen.h
@@ -264,7 +264,7 @@ private:
 	const char *category_;
 	ScreenManager *screenManager_;
 	std::string valueText_;
-	bool restoreFocus_;
+	bool restoreFocus_ = false;
 	std::set<int> hidden_;
 };
 
diff --git a/ext/native/ui/viewgroup.cpp b/ext/native/ui/viewgroup.cpp
index 50dabcead2..5c93a4c4c3 100644
--- a/ext/native/ui/viewgroup.cpp
+++ b/ext/native/ui/viewgroup.cpp
@@ -1314,8 +1314,10 @@ EventReturn ListView::OnItemCallback(int num, EventParams &e) {
 	View *focused = GetFocusedView();
 	OnChoice.Trigger(ev);
 	CreateAllItems();
-	if (focused)
-		SetFocusedView(e.v);
+	// TODO: At this point, focused may no longer exist, depending on what OnChoice.Trigger does.
+	// Disable the refocus feature for now.
+	// if (focused)
+	//	SetFocusedView(e.v);
 	return EVENT_DONE;
 }