diff --git a/src/modules/Workspaces/WorkspacesEditor/MainPage.xaml b/src/modules/Workspaces/WorkspacesEditor/MainPage.xaml
index dd1749143e..8ea28b9edf 100644
--- a/src/modules/Workspaces/WorkspacesEditor/MainPage.xaml
+++ b/src/modules/Workspaces/WorkspacesEditor/MainPage.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
     x:Class="WorkspacesEditor.MainPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -198,7 +198,7 @@
                                 <Grid HorizontalAlignment="Stretch">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="110" />
+                                        <ColumnDefinition Width="Auto" />
                                     </Grid.ColumnDefinitions>
                                     <StackPanel
                                         Margin="12,14,10,10"
diff --git a/src/modules/Workspaces/WorkspacesEditor/SnapshotWindow.xaml b/src/modules/Workspaces/WorkspacesEditor/SnapshotWindow.xaml
index 5dcceeb88b..6c213fd390 100644
--- a/src/modules/Workspaces/WorkspacesEditor/SnapshotWindow.xaml
+++ b/src/modules/Workspaces/WorkspacesEditor/SnapshotWindow.xaml
@@ -9,7 +9,6 @@
     xmlns:ui="http://schemas.modernwpf.com/2019"
     Title="{x:Static props:Resources.SnapshotWindowTitle}"
     Width="350"
-    Height="140"
     ui:TitleBar.Background="{DynamicResource PrimaryBackgroundBrush}"
     ui:TitleBar.InactiveBackground="{DynamicResource TertiaryBackgroundBrush}"
     ui:WindowHelper.UseModernWindowStyle="True"
@@ -18,6 +17,7 @@
     BorderThickness="5"
     Closing="Window_Closing"
     ResizeMode="NoResize"
+    SizeToContent="Height"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <Grid Margin="5" Background="Transparent">
@@ -31,9 +31,10 @@
         </Grid.ColumnDefinitions>
         <TextBlock
             Grid.ColumnSpan="2"
-            Margin="5"
+            Margin="5,5,5,15"
             Foreground="{DynamicResource PrimaryForegroundBrush}"
-            Text="{x:Static props:Resources.SnapshotDescription}" />
+            Text="{x:Static props:Resources.SnapshotDescription}"
+            TextWrapping="Wrap" />
         <Button
             x:Name="CancelButton"
             Grid.Row="1"
diff --git a/src/modules/Workspaces/WorkspacesEditor/WorkspacesEditorPage.xaml b/src/modules/Workspaces/WorkspacesEditor/WorkspacesEditorPage.xaml
index c952d00341..a9f352b29e 100644
--- a/src/modules/Workspaces/WorkspacesEditor/WorkspacesEditorPage.xaml
+++ b/src/modules/Workspaces/WorkspacesEditor/WorkspacesEditorPage.xaml
@@ -104,7 +104,7 @@
                             </StackPanel>
                             <controls:ResetIsEnabled Grid.Column="4">
                                 <Button
-                                    Width="120"
+                                    Width="Auto"
                                     Margin="10,5"
                                     Padding="24,6"
                                     AutomationProperties.Name="{x:Static props:Resources.Delete}"