diff --git a/AssetStudio.GUI/AssetBrowser.cs b/AssetStudio.GUI/AssetBrowser.cs
index c04c874..7bdec1e 100644
--- a/AssetStudio.GUI/AssetBrowser.cs
+++ b/AssetStudio.GUI/AssetBrowser.cs
@@ -220,8 +220,8 @@ namespace AssetStudio.GUI
                     break;
                 case Mesh _ when ClassIDType.Mesh.CanExport():
                 case TextAsset _ when ClassIDType.TextAsset.CanExport():
-                case AnimationClip _ when ClassIDType.Font.CanExport():
-                case Font _ when ClassIDType.GameObject.CanExport():
+                case AnimationClip _ when ClassIDType.AnimationClip.CanExport():
+                case Font _ when ClassIDType.Font.CanExport():
                 case MovieTexture _ when ClassIDType.MovieTexture.CanExport():
                 case Sprite _ when ClassIDType.Sprite.CanExport():
                 case Material _ when ClassIDType.Material.CanExport():
diff --git a/AssetStudio.GUI/Studio.cs b/AssetStudio.GUI/Studio.cs
index c503d86..ba1b130 100644
--- a/AssetStudio.GUI/Studio.cs
+++ b/AssetStudio.GUI/Studio.cs
@@ -548,7 +548,7 @@ namespace AssetStudio.GUI
                         case AssetGroupOption.ByContainer: //container path
                             if (!string.IsNullOrEmpty(asset.Container))
                             {
-                                exportPath = Path.Combine(savePath, Path.GetDirectoryName(asset.Container));
+                                exportPath = Path.HasExtension(asset.Container) ? Path.Combine(savePath, Path.GetDirectoryName(asset.Container)) : Path.Combine(savePath, asset.Container);
                             }
                             else
                             {