diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs
index 2ea058944..2261ec2b9 100644
--- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs
+++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs
@@ -497,7 +497,7 @@ namespace Spine.Unity.Editor {
 
 		static void AddDependentAtlasIfImageChanged (List<string> atlasPaths, List<string> imagePaths) {
 			foreach (string imagePath in imagePaths) {
-				string atlasPath = imagePath.Replace(".png", ".atlas.txt");
+				string atlasPath = Path.ChangeExtension(imagePath, ".atlas.txt");
 				if (!System.IO.File.Exists(atlasPath))
 					continue;
 
diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineEditorUtilities.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineEditorUtilities.cs
index a6d258e8f..f5a080064 100644
--- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineEditorUtilities.cs
+++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineEditorUtilities.cs
@@ -173,17 +173,22 @@ namespace Spine.Unity.Editor {
 			if (EditorApplication.isPlayingOrWillChangePlaymode) return;
 
 			string[] folders = { "Assets", "Packages" };
-			string[] assets = AssetDatabase.FindAssets("t:script SpineEditorUtilities", folders);
-			string assetPath = AssetDatabase.GUIDToAssetPath(assets[0]);
-			editorPath = Path.GetDirectoryName(assetPath).Replace('\\', '/');
-
+			string[] assets;
+			string assetPath;
 			assets = AssetDatabase.FindAssets("t:texture icon-subMeshRenderer", folders);
 			if (assets.Length > 0) {
 				assetPath = AssetDatabase.GUIDToAssetPath(assets[0]);
 				editorGUIPath = Path.GetDirectoryName(assetPath).Replace('\\', '/');
-			} else {
-				editorGUIPath = editorPath.Replace("/Utility", "/GUI");
 			}
+			assets = AssetDatabase.FindAssets("t:script SpineEditorUtilities", folders);
+			if (assets.Length > 0) {
+				assetPath = AssetDatabase.GUIDToAssetPath(assets[0]);
+				editorPath = Path.GetDirectoryName(assetPath).Replace('\\', '/');
+				if (string.IsNullOrEmpty(editorGUIPath))
+					editorGUIPath = editorPath.Replace("/Utility", "/GUI");
+			}
+			if (string.IsNullOrEmpty(editorGUIPath))
+				return;
 			Icons.Initialize();
 
 			// Drag and Drop