diff --git a/Terminal.Gui/View/View.Navigation.cs b/Terminal.Gui/View/View.Navigation.cs
index e5fda2de5..51d421c64 100644
--- a/Terminal.Gui/View/View.Navigation.cs
+++ b/Terminal.Gui/View/View.Navigation.cs
@@ -364,11 +364,6 @@ public partial class View // Focus and cross-view navigation management (TabStop
             return (false, true);
         }
 
-        //// If we previously had a subview with focus (`Focused = subview`), we need to make sure that all subviews down the `subview`-hierarchy LeaveFocus.
-        //// LeaveFocus will recurse down the subview hierarchy and will also set PreviouslyMostFocused
-        //View focused = Focused;
-        //focused?.SetHasFocusFalse (this, true);
-
         // Make sure superviews up the superview hierarchy have focus.
         // Any of them may cancel gaining focus. In which case we need to back out.
         if (SuperView is { HasFocus: false } sv)
@@ -408,8 +403,6 @@ public partial class View // Focus and cross-view navigation management (TabStop
                     // Couldn't advance, so we're the most focused view in the application
                     _previouslyMostFocused = null;
                     Application.Navigation?.SetFocused (this);
-
-                    //NotifyFocusChanged (HasFocus, previousFocusedView, this);
                 }
             }
         }
diff --git a/UICatalog/Scenarios/ConfigurationEditor.cs b/UICatalog/Scenarios/ConfigurationEditor.cs
index 97822796b..ac123217e 100644
--- a/UICatalog/Scenarios/ConfigurationEditor.cs
+++ b/UICatalog/Scenarios/ConfigurationEditor.cs
@@ -150,7 +150,11 @@ public class ConfigurationEditor : Scenario
                                         };
         }
 
-        _tileView.Tiles.ToArray () [1].ContentView.SetFocus ();
+        if (_tileView.Tiles.Count > 2)
+        {
+            _tileView.Tiles.ToArray () [1].ContentView.SetFocus ();
+        }
+
         Application.Top.LayoutSubviews ();
     }