diff --git a/Content.Client/Changelog/ChangelogButton.cs b/Content.Client/Changelog/ChangelogButton.cs
index 9178708ef1..6b1116cca0 100644
--- a/Content.Client/Changelog/ChangelogButton.cs
+++ b/Content.Client/Changelog/ChangelogButton.cs
@@ -14,6 +14,10 @@ namespace Content.Client.Changelog
             IoCManager.InjectDependencies(this);
 
             OnPressed += OnOnPressed;
+
+            // So that measuring before opening returns a correct height,
+            // and the window has the correct size when opened.
+            Text = " ";
         }
 
         protected override void EnteredTree()
diff --git a/Content.Client/EscapeMenu/UI/EscapeMenu.xaml b/Content.Client/EscapeMenu/UI/EscapeMenu.xaml
index baed55524a..6f4b07f0d1 100644
--- a/Content.Client/EscapeMenu/UI/EscapeMenu.xaml
+++ b/Content.Client/EscapeMenu/UI/EscapeMenu.xaml
@@ -4,7 +4,7 @@
             Title="{Loc 'ui-escape-title'}"
             Resizable="False">
 
-    <BoxContainer Orientation="Vertical" SeparationOverride="4" CustomMinimumSize="150 160">
+    <BoxContainer Orientation="Vertical" SeparationOverride="4" MinWidth="150">
         <changelog:ChangelogButton />
         <ui:VoteCallMenuButton />
         <Button Name="OptionsButton" Text="{Loc 'ui-escape-options'}" />