diff --git a/v2rayN/v2rayN.Desktop/Views/CustomConfigWindow.axaml b/v2rayN/v2rayN.Desktop/Views/CustomConfigWindow.axaml
index 80218aa8..97e89631 100644
--- a/v2rayN/v2rayN.Desktop/Views/CustomConfigWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/CustomConfigWindow.axaml
@@ -36,108 +36,98 @@
 
         <TabControl HorizontalContentAlignment="Stretch">
             <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbRayCustomConfig}">
-                <Grid Margin="{StaticResource Margin4}">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
+                <DockPanel Margin="{StaticResource Margin4}">
+                    <Grid DockPanel.Dock="Top" RowDefinitions="Auto,Auto">
 
-                    <TextBlock
-                        Grid.Row="0"
-                        Margin="{StaticResource Margin4}"
-                        VerticalAlignment="Center"
-                        Text="{x:Static resx:ResUI.TbRayCustomConfigDesc}" />
-                    
-                    <Grid Grid.Row="1">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
+                        <StackPanel Grid.Row="0" Orientation="Horizontal">
+                            <TextBlock
+                                Grid.Row="0"
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbRayCustomConfigDesc}" />
+                        </StackPanel>
 
-                        <TextBlock
-                            Grid.Column="0"
-                            Margin="{StaticResource Margin4}"
-                            VerticalAlignment="Center"
-                            Text="{x:Static resx:ResUI.TbCustomConfigEnable}" />
-                        <ToggleSwitch
-                            x:Name="rayCustomConfigEnable"
-                            Grid.Column="1"
-                            Margin="{StaticResource Margin4}"
-                            HorizontalAlignment="Left" />
+                        <StackPanel Grid.Row="1" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbCustomConfigEnable}" />
+                            <ToggleSwitch
+                                x:Name="rayCustomConfigEnable"
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
                     </Grid>
 
-                    <TextBox
-                        x:Name="rayCustomConfig"
-                        Grid.Row="2"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        BorderThickness="1"
-                        Classes="TextArea"
+                    <HeaderedContentControl
                         Margin="{StaticResource Margin4}"
-                        TextWrapping="Wrap"
-                        Watermark="xray json config" />
-                </Grid>
+                        BorderBrush="Gray"
+                        BorderThickness="1"
+                        Header="xray json config">
+                        <TextBox
+                            x:Name="rayCustomConfig"
+                            VerticalAlignment="Stretch"
+                            Classes="TextArea"
+                            MinLines="10"
+                            TextWrapping="Wrap" />
+                    </HeaderedContentControl>
+                </DockPanel>
             </TabItem>
             <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbCustomConfigSingbox}">
-                <Grid Margin="{StaticResource Margin4}">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
+                <DockPanel Margin="{StaticResource Margin4}">
+                    <Grid DockPanel.Dock="Top" RowDefinitions="Auto,Auto">
 
-                    <TextBlock
-                        Grid.Row="0"
-                        Margin="{StaticResource Margin4}"
-                        VerticalAlignment="Center"
-                        Text="{x:Static resx:ResUI.TbSBCustomConfigDesc}" />
-                    
-                    <Grid Grid.Row="1">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
+                        <StackPanel Grid.Row="0" Orientation="Horizontal">
+                            <TextBlock
+                                Grid.Row="0"
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbSBCustomConfigDesc}" />
+                        </StackPanel>
 
-                        <TextBlock
-                            Grid.Column="0"
-                            Margin="{StaticResource Margin4}"
-                            VerticalAlignment="Center"
-                            Text="{x:Static resx:ResUI.TbCustomConfigEnable}" />
-                        <ToggleSwitch
-                            x:Name="sbCustomConfigEnable"
-                            Grid.Column="1"
-                            Margin="{StaticResource Margin4}"
-                            HorizontalAlignment="Left" />
+                        <StackPanel Grid.Row="1" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbCustomConfigEnable}" />
+                            <ToggleSwitch
+                                x:Name="sbCustomConfigEnable"
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
                     </Grid>
 
-                    <Grid Grid.Row="2" Margin="{StaticResource Margin4}" ColumnDefinitions="*,10,*">
+                    <Grid Margin="{StaticResource Margin4}" ColumnDefinitions="*,10,*">
 
-                        <TextBox
-                            x:Name="sbCustomConfig"
+                        <HeaderedContentControl
                             Grid.Column="0"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
+                            BorderBrush="Gray"
                             BorderThickness="1"
-                            Classes="TextArea"
-                            Margin="{StaticResource Margin4}"
-                            TextWrapping="Wrap"
-                            Watermark="sing-box json config" />
+                            Header="sing-box json config">
+                            <TextBox
+                                x:Name="sbCustomConfig"
+                                VerticalAlignment="Stretch"
+                                Classes="TextArea"
+                                MinLines="10"
+                                TextWrapping="Wrap" />
+                        </HeaderedContentControl>
 
                         <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
 
-                        <TextBox
-                            x:Name="sbCustomTunConfig"
+                        <HeaderedContentControl
                             Grid.Column="2"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
+                            BorderBrush="Gray"
                             BorderThickness="1"
-                            Classes="TextArea"
-                            Margin="{StaticResource Margin4}"
-                            TextWrapping="Wrap"
-                            Watermark="sing-box json tun config" />
+                            Header="sing-box json tun config">
+                            <TextBox
+                                x:Name="sbCustomTunConfig"
+                                VerticalAlignment="Stretch"
+                                Classes="TextArea"
+                                MinLines="10"
+                                TextWrapping="Wrap" />
+                        </HeaderedContentControl>
                     </Grid>
-                </Grid>
+                </DockPanel>
             </TabItem>
         </TabControl>
     </DockPanel>