@@ -792,7 +792,7 @@ namespace Terminal.Gui {
listview.SetSource (searchset);
listview.Height = CalculatetHeight ();
- if (Subviews.Count > 0) {
+ if (HasFocus && Subviews.Count > 0) {
search.SetFocus ();
}
@@ -773,6 +773,10 @@ namespace Terminal.Gui {
var oldStep = currentStep;
currentStep = newStep;
+ if (currentStep is null) {
+ return false;
+ }
+
UpdateButtonsAndTitle ();
// Set focus to the nav buttons