diff --git a/src/Shared/HandyControl_Shared/Controls/Window/Window.cs b/src/Shared/HandyControl_Shared/Controls/Window/Window.cs
index 7de0ebbe2..76e617d56 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/Window.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/Window.cs
@@ -49,7 +49,14 @@ public class Window : System.Windows.Window
 
         static Window()
         {
-            StyleProperty.OverrideMetadata(typeof(Window), new FrameworkPropertyMetadata(ResourceHelper.GetResourceInternal<Style>(ResourceToken.WindowWin10)));
+            try
+            {
+                StyleProperty.OverrideMetadata(typeof(Window), new FrameworkPropertyMetadata(ResourceHelper.GetResourceInternal<Style>(ResourceToken.WindowWin10)));
+            }
+            catch
+            {
+                StyleProperty.OverrideMetadata(typeof(Window), new FrameworkPropertyMetadata(null));
+            }
         }
 
         public Window()
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs
index 90b59ecea..0706ad1c9 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs
@@ -10,6 +10,8 @@ namespace HandyControl.Tools;
 /// </summary>
 public class ResourceHelper
 {
+    private static readonly Lazy<ResourceDictionary> _themeLazy = new(GetStandaloneTheme);
+
     private static ResourceDictionary _theme;
 
     /// <summary>
@@ -29,11 +31,17 @@ public static T GetResource<T>(string key)
 
     internal static T GetResourceInternal<T>(string key)
     {
-        if (GetTheme()[key] is T resource)
+        var theme = GetTheme();
+        if (theme != null && theme[key] is T resource)
         {
             return resource;
         }
 
+        if (Application.Current != null && Application.Current.TryFindResource(key) is T appResource)
+        {
+            return appResource;
+        }
+
         return default;
     }
 
@@ -72,7 +80,7 @@ public static ResourceDictionary GetSkin(Assembly assembly, string themePath, Sk
     /// <summary>
     ///     get HandyControl theme
     /// </summary>
-    public static ResourceDictionary GetTheme() => _theme ??= GetStandaloneTheme();
+    public static ResourceDictionary GetTheme() => _theme ??= _themeLazy.Value;
 
     public static ResourceDictionary GetStandaloneTheme()
     {