diff --git a/Engines/Forms/FlatRedBall.Forms/FlatRedBall.Forms.Shared/Controls/ListBox.cs b/Engines/Forms/FlatRedBall.Forms/FlatRedBall.Forms.Shared/Controls/ListBox.cs
index c1fd513f1..7488715f6 100644
--- a/Engines/Forms/FlatRedBall.Forms/FlatRedBall.Forms.Shared/Controls/ListBox.cs
+++ b/Engines/Forms/FlatRedBall.Forms/FlatRedBall.Forms.Shared/Controls/ListBox.cs
@@ -23,8 +23,13 @@ public class ListBox : ItemsControl , IInputReceiver
         public bool DoListItemsHaveFocus 
         {
             get => doListBoxItemsHaveFocus;
-            private set
+            set
             {
+                if(!IsFocused && value)
+                {
+                    IsFocused = true;
+                }
+
                 doListBoxItemsHaveFocus = value;
 
                 if (SelectedIndex > -1 && SelectedIndex < ListBoxItemsInternal.Count)
@@ -146,6 +151,10 @@ public int SelectedIndex
         /// </summary>
         public event Action<object, SelectionChangedEventArgs> SelectionChanged;
         public event FocusUpdateDelegate FocusUpdate;
+
+        /// <summary>
+        /// Event raised when the user presses a button at the top-level (if the list box has focus, but the individual items do not)
+        /// </summary>
         public event Action<Xbox360GamePad.Button> ControllerButtonPushed;
         public event Action<int> GenericGamepadButtonPushed;
 
diff --git a/FRBDK/Glue/TileGraphicsPlugin/TileGraphicsPlugin/EmbeddedCodeFiles/CollidableListVsTileShapeCollectionRelationship.cs b/FRBDK/Glue/TileGraphicsPlugin/TileGraphicsPlugin/EmbeddedCodeFiles/CollidableListVsTileShapeCollectionRelationship.cs
index 53d96f3aa..1ca48f376 100644
--- a/FRBDK/Glue/TileGraphicsPlugin/TileGraphicsPlugin/EmbeddedCodeFiles/CollidableListVsTileShapeCollectionRelationship.cs
+++ b/FRBDK/Glue/TileGraphicsPlugin/TileGraphicsPlugin/EmbeddedCodeFiles/CollidableListVsTileShapeCollectionRelationship.cs
@@ -31,10 +31,19 @@ public class CollidableListVsTileShapeCollectionRelationship<FirstCollidableT> :
 
         public CollidableListVsTileShapeCollectionRelationship(PositionedObjectList<FirstCollidableT> list, TileShapeCollection tileShapeCollection)
         {
-            data = new CollidableVsTileShapeCollectionData<FirstCollidableT>(tileShapeCollection);
+            SetTileShapeCollection(tileShapeCollection);
             this.list = list;
         }
 
+        /// <summary>
+        /// Sets the TileShapeCollection used by this CollisionRelationship. This is automatically called by the constructor, so it should only be manually called to change the TileShapeCollection after this relationship has been created.
+        /// </summary>
+        /// <param name="tileShapeCollection"></param>
+        public void SetTileShapeCollection(TileShapeCollection tileShapeCollection)
+        {
+            data = new CollidableVsTileShapeCollectionData<FirstCollidableT>(tileShapeCollection);
+        }
+
         public override bool DoCollisions()
         {
             bool didCollisionOccur = false;