diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
index 28d82319..477eca5d 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
@@ -722,11 +722,51 @@
                         Text="{x:Static resx:ResUI.TbPath}" />
                 </Grid>
 
-                <Separator Grid.Row="5" Margin="{StaticResource MarginTb8}" />
+                <Grid
+                    x:Name="gridFinalmask"
+                    Grid.Row="5"
+                    ColumnDefinitions="300,Auto">
+                    <TextBlock
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbFinalmask}" />
+                    <Button
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Margin="{StaticResource MarginLr4}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Classes="IconButton">
+                        <Button.Content>
+                            <PathIcon Data="{StaticResource SemiIconMore}">
+                                <PathIcon.RenderTransform>
+                                    <RotateTransform Angle="90" />
+                                </PathIcon.RenderTransform>
+                            </PathIcon>
+                        </Button.Content>
+                        <Button.Flyout>
+                            <Flyout>
+                                <StackPanel>
+                                    <TextBox
+                                        x:Name="txtFinalmask"
+                                        Width="400"
+                                        Margin="{StaticResource Margin4}"
+                                        AcceptsReturn="True"
+                                        Classes="TextArea"
+                                        TextWrapping="NoWrap" />
+                                </StackPanel>
+                            </Flyout>
+                        </Button.Flyout>
+                    </Button>
+                </Grid>
+
+                <Separator Grid.Row="6" Margin="{StaticResource MarginTb8}" />
 
                 <Grid
                     x:Name="gridTls"
-                    Grid.Row="6"
+                    Grid.Row="7"
                     ColumnDefinitions="300,Auto"
                     RowDefinitions="Auto,Auto,Auto,Auto,Auto">
 
@@ -745,7 +785,7 @@
                 </Grid>
                 <Grid
                     x:Name="gridTlsMore"
-                    Grid.Row="7"
+                    Grid.Row="8"
                     ColumnDefinitions="300,Auto"
                     IsVisible="False"
                     RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
@@ -908,7 +948,7 @@
                 </Grid>
                 <Grid
                     x:Name="gridRealityMore"
-                    Grid.Row="7"
+                    Grid.Row="8"
                     ColumnDefinitions="300,Auto"
                     IsVisible="False"
                     RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
@@ -996,28 +1036,7 @@
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
                 </Grid>
-                <Separator Grid.Row="8" Margin="{StaticResource MarginTb8}" />
-                <Grid
-                    x:Name="gridFinalmask"
-                    Grid.Row="9"
-                    ColumnDefinitions="300,Auto">
-                    <TextBlock
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Margin="{StaticResource Margin4}"
-                        VerticalAlignment="Center"
-                        Text="{x:Static resx:ResUI.TbFinalmask}" />
-                    <TextBox
-                        x:Name="txtFinalmask"
-                        Grid.Row="0"
-                        Grid.Column="1"
-                        Width="400"
-                        Margin="{StaticResource Margin4}"
-                        AcceptsReturn="True"
-                        Classes="TextArea"
-                        TextWrapping="NoWrap" />
-                </Grid>
-                <Separator Grid.Row="10" Margin="{StaticResource MarginTb8}" />
+                <Separator Grid.Row="9" Margin="{StaticResource MarginTb8}" />
             </Grid>
         </ScrollViewer>
     </DockPanel>
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml
index 87d53a40..e78e7f9b 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -930,12 +930,47 @@
                         Text="{x:Static resx:ResUI.TbPath}" />
                 </Grid>
 
+                <Grid x:Name="gridFinalmask" Grid.Row="5">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="300" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbFinalmask}" />
+                    <materialDesign:PopupBox
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        StaysOpen="True"
+                        Style="{StaticResource MaterialDesignToolForegroundPopupBox}">
+                        <StackPanel>
+                            <TextBox
+                                x:Name="txtFinalmask"
+                                Width="400"
+                                Margin="{StaticResource Margin4}"
+                                AcceptsReturn="True"
+                                HorizontalScrollBarVisibility="Auto"
+                                MaxLines="8"
+                                MinLines="4"
+                                Style="{StaticResource MyOutlinedTextBox}"
+                                TextWrapping="NoWrap"
+                                VerticalScrollBarVisibility="Auto" />
+                        </StackPanel>
+                    </materialDesign:PopupBox>
+                </Grid>
+
                 <Separator
-                    Grid.Row="5"
+                    Grid.Row="6"
                     Margin="0,2"
                     Style="{DynamicResource MaterialDesignSeparator}" />
 
-                <Grid x:Name="gridTls" Grid.Row="6">
+                <Grid x:Name="gridTls" Grid.Row="7">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
@@ -965,7 +1000,7 @@
                 </Grid>
                 <Grid
                     x:Name="gridTlsMore"
-                    Grid.Row="7"
+                    Grid.Row="8"
                     Visibility="Hidden">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
@@ -1154,7 +1189,7 @@
                 </Grid>
                 <Grid
                     x:Name="gridRealityMore"
-                    Grid.Row="7"
+                    Grid.Row="8"
                     Visibility="Hidden">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
@@ -1266,37 +1301,7 @@
                         Style="{StaticResource DefTextBox}" />
                 </Grid>
                 <Separator
-                    Grid.Row="8"
-                    Margin="0,2"
-                    Style="{DynamicResource MaterialDesignSeparator}" />
-                <Grid x:Name="gridFinalmask" Grid.Row="9">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="300" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Margin="{StaticResource Margin4}"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TbFinalmask}" />
-                    <TextBox
-                        x:Name="txtFinalmask"
-                        Grid.Row="0"
-                        Grid.Column="1"
-                        Width="400"
-                        Margin="{StaticResource Margin4}"
-                        AcceptsReturn="True"
-                        HorizontalScrollBarVisibility="Auto"
-                        MaxLines="8"
-                        MinLines="4"
-                        Style="{StaticResource MyOutlinedTextBox}"
-                        TextWrapping="NoWrap"
-                        VerticalScrollBarVisibility="Auto" />
-                </Grid>
-                <Separator
-                    Grid.Row="10"
+                    Grid.Row="9"
                     Margin="0,2"
                     Style="{DynamicResource MaterialDesignSeparator}" />
             </Grid>