diff --git a/src/Artemis.UI.Shared/Controls/DraggableNumberBox.axaml.cs b/src/Artemis.UI.Shared/Controls/DraggableNumberBox.axaml.cs
index 34a3af852..cb85a0bc6 100644
--- a/src/Artemis.UI.Shared/Controls/DraggableNumberBox.axaml.cs
+++ b/src/Artemis.UI.Shared/Controls/DraggableNumberBox.axaml.cs
@@ -187,7 +187,7 @@ public partial class DraggableNumberBox : UserControl
 
     private void HandleKeyUp(object? sender, KeyEventArgs e)
     {
-        if (e.Key == Key.Enter || e.Key == Key.Escape)
+        if (e.Key is Key.Enter or Key.Escape)
             Focus();
     }
 
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs
index 3fb88d5c5..87e7b3b2e 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs
@@ -63,7 +63,12 @@ public partial class VisualEditorView : ReactiveUserControl<VisualEditorViewMode
     private void UpdateZoomBorderBackground()
     {
         if (ZoomBorder.Background is VisualBrush visualBrush)
+        {
             visualBrush.DestinationRect = new RelativeRect(ZoomBorder.OffsetX * -1, ZoomBorder.OffsetY * -1, 20, 20, RelativeUnit.Absolute);
+            // Workaround
+            // This fixes an issue where the container is not invalidated, which leaves behind a 'smear' since Avalonia 11 rc1, check if still required later
+            ZoomBorder.InvalidateVisual();
+        }
     }
 
 
diff --git a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml.cs b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml.cs
index 797cad4d5..73b747355 100644
--- a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml.cs
+++ b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml.cs
@@ -48,6 +48,11 @@ public partial class SurfaceEditorView : ReactiveUserControl<SurfaceEditorViewMo
     private void UpdateZoomBorderBackground()
     {
         if (ContainerZoomBorder.Background is VisualBrush visualBrush)
+        {
             visualBrush.DestinationRect = new RelativeRect(ContainerZoomBorder.OffsetX * -1, ContainerZoomBorder.OffsetY * -1, 20, 20, RelativeUnit.Absolute);
+            // Workaround
+            // This fixes an issue where the container is not invalidated, which leaves behind a 'smear' since Avalonia 11 rc1, check if still required later
+            ContainerZoomBorder.InvalidateVisual();
+        }
     }
 }
\ No newline at end of file