diff --git a/FluentTest/TestContent.xaml.cs b/FluentTest/TestContent.xaml.cs
index af473d042..3d59feebf 100644
--- a/FluentTest/TestContent.xaml.cs
+++ b/FluentTest/TestContent.xaml.cs
@@ -180,6 +180,10 @@ private void ChangeTheme(Theme theme, string color)
                         owner.Style = null;
                         owner.Style = owner.FindResource("RibbonWindowStyle") as Style;
                         owner.Style = null;
+
+                        // Resize Window to work around alignment issues caused by theme change
+                        ++owner.Width;
+                        --owner.Width;
                     }
                 }
             }));