diff --git a/ManiacEditor/Editor.cs b/ManiacEditor/Editor.cs
index 4c8542c7..3b73ab78 100644
--- a/ManiacEditor/Editor.cs
+++ b/ManiacEditor/Editor.cs
@@ -1102,9 +1102,9 @@ private void Open_Click(object sender, EventArgs e)
 
                 foreach (SceneLayer layer in Scene.Layers)
                 {
-                    if (layer.Name == "FG Low\0")
+                    if (layer.Name == "FG Low\0" || layer.Name == "Playfield\0")
                         low_layer = layer;
-                    else if (layer.Name == "FG High\0")
+                    else if (layer.Name == "FG High\0" || layer.Name == "Ring Count\0")
                         high_layer = layer;
                 }
 
@@ -1115,6 +1115,11 @@ private void Open_Click(object sender, EventArgs e)
                     return;
                 }
 
+                ShowFGLow.Text = low_layer.Name.Substring(0, low_layer.Name.Length - 1);
+                EditFGLow.Text = low_layer.Name.Substring(0, low_layer.Name.Length - 1);
+                ShowFGHigh.Text = high_layer.Name.Substring(0, high_layer.Name.Length - 1);
+                EditFGHigh.Text = high_layer.Name.Substring(0, high_layer.Name.Length - 1);
+
                 FGLow = new EditorLayer(low_layer);
                 FGHigh = new EditorLayer(high_layer);
 
diff --git a/RSDKv5/StageTiles.cs b/RSDKv5/StageTiles.cs
index 4f91baf0..4a9a2cb4 100644
--- a/RSDKv5/StageTiles.cs
+++ b/RSDKv5/StageTiles.cs
@@ -15,7 +15,8 @@ public class StageTiles : IDisposable
         public StageTiles(string stage_directory)
         {
             Image = new GIF(Path.Combine(stage_directory, "16x16Tiles.gif"));
-            Config = new TilesConfig(Path.Combine(stage_directory, "TileConfig.bin"));
+            if (File.Exists(Path.Combine(stage_directory, "TileConfig.bin")))
+                Config = new TilesConfig(Path.Combine(stage_directory, "TileConfig.bin"));
         }
 
         public void Dispose()