From 696a135550f30548fb32049b126cdb9587d815bf Mon Sep 17 00:00:00 2001
From: Kevin Bost <kitokeboo@gmail.com>
Date: Thu, 3 Jul 2025 22:38:21 -0700
Subject: [PATCH] Applying fix for binding error

Fixes #3834
---
 .../Themes/MaterialDesignTheme.DialogHost.xaml         | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DialogHost.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DialogHost.xaml
index 52fffbdc88..1dd1ee9528 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DialogHost.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DialogHost.xaml
@@ -22,6 +22,9 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="wpf:DialogHost">
+          <ControlTemplate.Resources>
+            <converters:FirstNonNullConverter x:Key="FirstNonNullConverter" />
+          </ControlTemplate.Resources>
           <Grid x:Name="DialogHostRoot" Focusable="False">
             <VisualStateManager.VisualStateGroups>
               <VisualStateGroup x:Name="PopupStates">
@@ -217,7 +220,7 @@
               <Grid.OpacityMask>
                 <VisualBrush>
                   <VisualBrush.Visual>
-                    <MultiBinding Converter="{x:Static converters:FirstNonNullConverter.Instance}">
+                    <MultiBinding Converter="{StaticResource FirstNonNullConverter}">
                       <Binding ElementName="ContentCoverBorder" />
                       <Binding Source="{x:Static DependencyProperty.UnsetValue}" />
                     </MultiBinding>
@@ -259,6 +262,9 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="wpf:DialogHost">
+          <ControlTemplate.Resources>
+            <converters:FirstNonNullConverter x:Key="FirstNonNullConverter" />
+          </ControlTemplate.Resources>
           <Grid x:Name="DialogHostRoot" Focusable="False">
             <VisualStateManager.VisualStateGroups>
               <VisualStateGroup x:Name="PopupStates">
@@ -407,7 +413,7 @@
               <Grid.OpacityMask>
                 <VisualBrush>
                   <VisualBrush.Visual>
-                    <MultiBinding Converter="{x:Static converters:FirstNonNullConverter.Instance}">
+                    <MultiBinding Converter="{StaticResource FirstNonNullConverter}">
                       <Binding ElementName="ContentCoverBorder" />
                       <Binding Source="{x:Static DependencyProperty.UnsetValue}" />
                     </MultiBinding>