diff --git a/Views/Settings.xaml b/Views/Settings.xaml
index 4ca9744..833ea14 100644
--- a/Views/Settings.xaml
+++ b/Views/Settings.xaml
@@ -25,26 +25,29 @@
 
             <!-- 1. 컴퓨터 시작시 기동 -->
             <TextBlock Grid.Row="0" Text="컴퓨터 시작시 기동" VerticalAlignment="Center" FontWeight="SemiBold"/>
-            <CheckBox x:Name="chkStartup" Grid.Row="0" Grid.Column="1" Style="{DynamicResource ToggleSwitch}"
-                      ToolTip="Windows에 로그인하면 트레이로 자동 실행합니다. (작업 스케줄러에 등록)"/>
+            <DockPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" LastChildFill="True">
+                <CheckBox x:Name="chkStartup" DockPanel.Dock="Right" Style="{DynamicResource ToggleSwitch}"
+                          ToolTip="Windows에 로그인하면 트레이로 자동 실행합니다. (작업 스케줄러에 등록)"/>
+                <TextBlock Text="로그인 시 트레이로 자동 실행" Foreground="#78909C" VerticalAlignment="Center"/>
+            </DockPanel>
 
             <!-- 2. 단축키 -->
             <TextBlock Grid.Row="1" Text="단축키" VerticalAlignment="Center" FontWeight="SemiBold"/>
-            <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-                <TextBox x:Name="txtHotkey" Width="190" Height="28" IsReadOnly="True" IsReadOnlyCaretVisible="False"
+            <DockPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" LastChildFill="False">
+                <CheckBox x:Name="chkHotkey" DockPanel.Dock="Right" Style="{DynamicResource ToggleSwitch}"/>
+                <TextBlock DockPanel.Dock="Right" Text="Enable" VerticalAlignment="Center" Margin="16,0,8,0"/>
+                <TextBox x:Name="txtHotkey" DockPanel.Dock="Left" Width="190" Height="28" IsReadOnly="True" IsReadOnlyCaretVisible="False"
                          VerticalContentAlignment="Center" HorizontalContentAlignment="Center"
                          FontWeight="Bold" Cursor="Hand" Background="#FAFAFA"
                          ToolTip="여기를 클릭한 뒤 원하는 키 조합을 직접 누르세요. (Ctrl / Alt / Win 중 하나 이상 포함)"/>
-                <TextBlock Text="Enable" VerticalAlignment="Center" Margin="16,0,8,0"/>
-                <CheckBox x:Name="chkHotkey" Style="{DynamicResource ToggleSwitch}"/>
-            </StackPanel>
+            </DockPanel>
 
             <!-- 3. 서비스 시작시 로그보기 -->
             <TextBlock Grid.Row="2" Text="서비스 시작시 로그보기" VerticalAlignment="Center" FontWeight="SemiBold"/>
-            <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-                <CheckBox x:Name="chkOpLog" Style="{DynamicResource ToggleSwitch}"/>
-                <TextBlock Text="Start / Stop 등 작업 로그를 초기화면 하단에 표시" Foreground="#78909C" VerticalAlignment="Center" Margin="12,0,0,0"/>
-            </StackPanel>
+            <DockPanel Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" LastChildFill="True">
+                <CheckBox x:Name="chkOpLog" DockPanel.Dock="Right" Style="{DynamicResource ToggleSwitch}"/>
+                <TextBlock Text="Start / Stop 등 작업 로그를 초기화면 하단에 표시" Foreground="#78909C" VerticalAlignment="Center"/>
+            </DockPanel>
 
             <!-- 4. 로그창 띄우기 -->
             <TextBlock Grid.Row="3" Text="로그창 띄우기" VerticalAlignment="Center" FontWeight="SemiBold"/>
@@ -63,10 +66,10 @@
 
             <!-- 6. Windows 종료키 -->
             <TextBlock Grid.Row="5" Text="Windows 종료키" VerticalAlignment="Center" FontWeight="SemiBold"/>
-            <StackPanel Grid.Row="5" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-                <CheckBox x:Name="chkShutdownButtons" Style="{DynamicResource ToggleSwitch}"/>
-                <TextBlock Text="초기화면에 Windows 강제종료 / 재시작 버튼 표시" Foreground="#78909C" VerticalAlignment="Center" Margin="12,0,0,0"/>
-            </StackPanel>
+            <DockPanel Grid.Row="5" Grid.Column="1" VerticalAlignment="Center" LastChildFill="True">
+                <CheckBox x:Name="chkShutdownButtons" DockPanel.Dock="Right" Style="{DynamicResource ToggleSwitch}"/>
+                <TextBlock Text="초기화면에 Windows 강제종료 / 재시작 버튼 표시" Foreground="#78909C" VerticalAlignment="Center"/>
+            </DockPanel>
 
             <TextBlock Grid.Row="6" Grid.ColumnSpan="2" x:Name="txtDataPath" Foreground="#90A4AE" Margin="0,14,0,0" TextWrapping="Wrap"/>
         </Grid>
diff --git a/Views/Styles.xaml b/Views/Styles.xaml
index b54b702..c0f2f07 100644
--- a/Views/Styles.xaml
+++ b/Views/Styles.xaml
@@ -38,7 +38,7 @@
                         <Border x:Name="Track" Width="46" Height="24" CornerRadius="12" Background="#BDBDBD">
                             <Ellipse x:Name="Knob" Width="18" Height="18" Fill="White" HorizontalAlignment="Left" Margin="3,0"/>
                         </Border>
-                        <TextBlock x:Name="Lbl" Text="끔" Margin="8,0,0,0" VerticalAlignment="Center" Foreground="#616161"/>
+                        <TextBlock x:Name="Lbl" Text="끔" Width="22" Margin="8,0,0,0" VerticalAlignment="Center" Foreground="#616161"/>
                     </StackPanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">
diff --git a/Windows/SettingsWindow.cs b/Windows/SettingsWindow.cs
index 466b06c..b4aa14e 100644
--- a/Windows/SettingsWindow.cs
+++ b/Windows/SettingsWindow.cs
@@ -20,7 +20,7 @@ namespace JJServiceManager
             _s = current;
 
             Title = "설정";
-            Width = 640;
+            Width = 720;
             SizeToContent = SizeToContent.Height;
             ResizeMode = ResizeMode.NoResize;
             FontFamily = new FontFamily("Malgun Gothic");