diff --git a/src/Moryx.Controls/EntryEditor/EntryViewModel.cs b/src/Moryx.Controls/EntryEditor/EntryViewModel.cs
index af6a0c0..8ac2e55 100644
--- a/src/Moryx.Controls/EntryEditor/EntryViewModel.cs
+++ b/src/Moryx.Controls/EntryEditor/EntryViewModel.cs
@@ -8,6 +8,7 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Runtime.CompilerServices;
+using System.Windows.Threading;
 using Moryx.Serialization;
 using Moryx.Tools;
 
@@ -76,7 +77,10 @@ public string Value
                 if (Entry.Value.Current is not null && Entry.Value.Current.Equals(value))
                     return;
                 Entry.Value.Current = value;
-                OnPropertyChanged();
+                Dispatcher.CurrentDispatcher.Invoke(() =>
+                {
+                    OnPropertyChanged();
+                });
             }
         }
 
@@ -105,7 +109,10 @@ public ObservableCollection<EntryViewModel> SubEntries
                     _subEntries.CollectionChanged -= SyncSubEntries;
                 _subEntries = value;
                 _subEntries.CollectionChanged += SyncSubEntries;
-                OnPropertyChanged();
+                Dispatcher.CurrentDispatcher.Invoke(() =>
+                {
+                    OnPropertyChanged();
+                });
             }
         }
 
diff --git a/src/Moryx.WpfToolkit/Base/EddieButtonBase/EddieButtonBase.cs b/src/Moryx.WpfToolkit/Base/EddieButtonBase/EddieButtonBase.cs
index c841082..47deb45 100644
--- a/src/Moryx.WpfToolkit/Base/EddieButtonBase/EddieButtonBase.cs
+++ b/src/Moryx.WpfToolkit/Base/EddieButtonBase/EddieButtonBase.cs
@@ -8,7 +8,7 @@
 namespace Moryx.WpfToolkit
 {
     /// <summary>
-    /// Bass class for the eddie buttons which adds some dependency properties to the
+    /// Base class for the eddie buttons which adds some dependency properties to the
     /// basic <see cref="Button"/>
     /// </summary>
     public abstract class EddieButtonBase : Button