diff --git a/frontend/src/app/site-finder/analysis/[cad]/page.tsx b/frontend/src/app/site-finder/analysis/[cad]/page.tsx
index e73f256d..4b804421 100644
--- a/frontend/src/app/site-finder/analysis/[cad]/page.tsx
+++ b/frontend/src/app/site-finder/analysis/[cad]/page.tsx
@@ -75,8 +75,13 @@ interface PageProps {
 }
 
 export default function AnalysisPage({ params }: PageProps) {
-  // React 19: use() unwraps Promise params (app router pattern)
-  const { cad } = use(params);
+  // React 19: use() unwraps Promise params (app router pattern).
+  // Next.js delivers `cad` URL-encoded (":" -> "%3A"); decode once here so
+  // downstream hooks/components see the canonical "66:41:0204016:10" and can
+  // re-encode exactly once when building API URLs / hrefs (prevents double-
+  // encode that made backend regex reject the cad with HTTP 400).
+  const { cad: cadRaw } = use(params);
+  const cad = decodeURIComponent(cadRaw);
 
   return (
     <main
diff --git a/frontend/src/app/site-finder/page.tsx b/frontend/src/app/site-finder/page.tsx
index ea0a68f2..215d46c0 100644
--- a/frontend/src/app/site-finder/page.tsx
+++ b/frontend/src/app/site-finder/page.tsx
@@ -167,22 +167,24 @@ export default function SiteFinderPage() {
           />
         </div>
 
-        {/* Right sidebar */}
-        <div
-          style={{
-            width: 300,
-            flexShrink: 0,
-            padding: "16px 16px 16px 0",
-            display: "flex",
-            flexDirection: "column",
-            gap: 12,
-            overflowY: "auto",
-          }}
-        >
-          <CadInput onSubmit={handleCadSubmit} loading={false} />
-          <RecentParcels />
-          <ParcelLegend />
-        </div>
+        {/* Right sidebar — hidden when ParcelDrawer is open to avoid overlap */}
+        {selectedParcel == null && (
+          <div
+            style={{
+              width: 300,
+              flexShrink: 0,
+              padding: "16px 16px 16px 0",
+              display: "flex",
+              flexDirection: "column",
+              gap: 12,
+              overflowY: "auto",
+            }}
+          >
+            <CadInput onSubmit={handleCadSubmit} loading={false} />
+            <RecentParcels />
+            <ParcelLegend />
+          </div>
+        )}
       </div>
 
       {/* Parcel drawer (slide-in from right) */}