diff --git a/Terminal.Gui/Views/ListView.cs b/Terminal.Gui/Views/ListView.cs
index a28650e89..2128e37f0 100644
--- a/Terminal.Gui/Views/ListView.cs
+++ b/Terminal.Gui/Views/ListView.cs
@@ -180,6 +180,8 @@ namespace Terminal.Gui {
 			if (source == null)
 				throw new ArgumentNullException (nameof (source));
 			Source = MakeWrapper (source);
+			((ListWrapper) Source).Container = this;
+			((ListWrapper) Source).Driver = Driver;
 		}
 
 		bool allowsMarking;
diff --git a/Terminal.Gui/Views/Menu.cs b/Terminal.Gui/Views/Menu.cs
index e71ed482c..c2e35c53b 100644
--- a/Terminal.Gui/Views/Menu.cs
+++ b/Terminal.Gui/Views/Menu.cs
@@ -382,7 +382,7 @@ namespace Terminal.Gui {
 			selected = -1;
 			SetNeedsDisplay ();
 			SuperView.Remove (openMenu);
-			previousFocused.SuperView.SetFocus (previousFocused);
+			previousFocused?.SuperView?.SetFocus (previousFocused);
 			openMenu = null;
 		}