diff --git a/packaging/Package.appxmanifest b/packaging/Package.appxmanifest
index 0dd9969..0aa68c7 100644
--- a/packaging/Package.appxmanifest
+++ b/packaging/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4" xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5" xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10" IgnorableNamespaces="uap rescap desktop desktop4 desktop5 com">
-  <Identity Name="Everything2Everything.YunChan" Publisher="CN=Everything2EverythingDev" Version="1.0.20.0" ProcessorArchitecture="x64" />
+  <Identity Name="Everything2Everything.YunChan" Publisher="CN=Everything2EverythingDev" Version="1.0.21.0" ProcessorArchitecture="x64" />
   <Properties>
     <DisplayName>Everything2Everything</DisplayName>
     <PublisherDisplayName>YunChan</PublisherDisplayName>
diff --git a/src/Everything2Everything.App/Views/MainWindow.xaml b/src/Everything2Everything.App/Views/MainWindow.xaml
index 429a3d1..708ccb9 100644
--- a/src/Everything2Everything.App/Views/MainWindow.xaml
+++ b/src/Everything2Everything.App/Views/MainWindow.xaml
@@ -1232,8 +1232,8 @@
                     </Grid>
                     <!-- /좌측 컬럼 끝 -->
 
-                    <!-- 우측: Preview 컬럼 (항상 보임) -->
-                    <Border Grid.Row="1" Grid.Column="1"
+                    <!-- 우측: Preview 컬럼 (상단 툴바부터 전고 일체형) -->
+                    <Border Grid.Row="0" Grid.RowSpan="2" Grid.Column="1"
                             Background="{StaticResource FsBgPanel}"
                             BorderBrush="{StaticResource FsBorderSubtle}"
                             BorderThickness="1,0,0,0">
@@ -1244,8 +1244,8 @@
                                 <RowDefinition Height="Auto"/>
                             </Grid.RowDefinitions>
 
-                            <!-- 헤더 -->
-                            <Border Grid.Row="0" Padding="20,12,16,12"
+                            <!-- 헤더: 좌측 검색 툴바와 수평 기준선 및 하단 경계선 정합 -->
+                            <Border Grid.Row="0" Height="47" Padding="20,0,16,0"
                                     BorderBrush="{StaticResource FsBorderSubtle}"
                                     BorderThickness="0,0,0,1">
                                 <Grid VerticalAlignment="Center">
diff --git a/src/Everything2Everything.Tests/DesignAuditAstTests.cs b/src/Everything2Everything.Tests/DesignAuditAstTests.cs
index e0b98e7..9cd924d 100644
--- a/src/Everything2Everything.Tests/DesignAuditAstTests.cs
+++ b/src/Everything2Everything.Tests/DesignAuditAstTests.cs
@@ -1078,6 +1078,32 @@ public class DesignAuditAstTests
         Assert.True(hasCtrlA, "Window.InputBindings에 Ctrl+A 단축키가 등록되어야 합니다.");
         Assert.True(hasDelete, "Window.InputBindings에 Delete 단축키가 등록되어야 합니다.");
     }
+
+    [Fact]
+    public void InspectorPanel_MustSpanFullHeight_And_NotLeaveTopDeadSpace()
+    {
+        // 미리보기 패널(Inspector Border)은 검색 툴바 상단에 빈 공간/어색한 마진을 남기지 않도록
+        // Grid.RowSpan="2" 및 Grid.Row="0"으로 메인 영역 전체 높이에 걸쳐 배치되어야 한다.
+        var file = Path.Combine(ViewsDir, "MainWindow.xaml");
+        var doc = XDocument.Parse(File.ReadAllText(file));
+
+        var mainViewGrid = doc.Descendants().FirstOrDefault(e =>
+            e.Name.LocalName == "Grid" &&
+            e.Elements().Any(c => c.Name.LocalName == "Grid.ColumnDefinitions" &&
+                                  c.Elements().Any(cd => cd.Attribute(XName.Get("Name", "http://schemas.microsoft.com/winfx/2006/xaml"))?.Value == "InspectorColumn")));
+        Assert.NotNull(mainViewGrid);
+
+        var previewBorder = mainViewGrid.Elements().FirstOrDefault(e =>
+            e.Name.LocalName == "Border" &&
+            e.Attribute("Grid.Column")?.Value == "1");
+        Assert.NotNull(previewBorder);
+
+        var row = previewBorder.Attribute("Grid.Row")?.Value ?? "0";
+        var rowSpan = previewBorder.Attribute("Grid.RowSpan")?.Value;
+
+        Assert.Equal("0", row);
+        Assert.Equal("2", rowSpan);
+    }
 }