diff --git a/src/Avalonia.FreeDesktop/DBusMenuExporter.cs b/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
index b5e35db969..1c58ff3ecf 100644
--- a/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
+++ b/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
@@ -65,6 +65,8 @@ namespace Avalonia.FreeDesktop
                     // and it's not important to know if it succeeds
                     // since even if we register the window it's not guaranteed that
                     // menu will be actually exported
+                    
+                    Dispose();
                 }
             }
 
diff --git a/src/Avalonia.FreeDesktop/DBusSystemTray/SNIDBus.cs b/src/Avalonia.FreeDesktop/DBusSystemTray/SNIDBus.cs
index f0476f6b52..210f9e3159 100644
--- a/src/Avalonia.FreeDesktop/DBusSystemTray/SNIDBus.cs
+++ b/src/Avalonia.FreeDesktop/DBusSystemTray/SNIDBus.cs
@@ -93,6 +93,8 @@ namespace Avalonia.FreeDesktop.DBusSystemTray
                 AttentionIconPixmap = new[] { new Pixmap(0, 0, new byte[] { }), new Pixmap(0, 0, new byte[] { }) },
                 // IconPixmap = new[] { new Pixmap(1, 1, new byte[] { 0xFF, 0xFF, 0xFF, 0xFF }) }
             };
+            
+            InvalidateAll();
         }
 
         public async Task ContextMenuAsync(int X, int Y)