diff --git a/apps/web/app/components/sidebar.tsx b/apps/web/app/components/sidebar.tsx
index e44a1e42360..6b4feed7115 100644
--- a/apps/web/app/components/sidebar.tsx
+++ b/apps/web/app/components/sidebar.tsx
@@ -216,7 +216,9 @@ function WorkspaceSection({ tree, onRefresh }: { tree: TreeNode[]; onRefresh: ()
   const handleSelect = useCallback((node: TreeNode) => {
     // Navigate to workspace page for actionable items
     if (node.type === "object" || node.type === "document" || node.type === "file" || node.type === "database" || node.type === "report") {
-      window.location.href = `/?path=${encodeURIComponent(node.path)}`;
+      const params = new URLSearchParams(window.location.search);
+      params.set("path", node.path);
+      window.location.href = `/?${params.toString()}`;
     }
   }, []);
 
diff --git a/apps/web/app/components/workspace/database-viewer.tsx b/apps/web/app/components/workspace/database-viewer.tsx
index e86b328f5e9..6c418d0fc16 100644
--- a/apps/web/app/components/workspace/database-viewer.tsx
+++ b/apps/web/app/components/workspace/database-viewer.tsx
@@ -170,7 +170,9 @@ export function DuckDBMissing() {
       <button
         type="button"
         onClick={() => {
-          window.location.href = "/?send=" + encodeURIComponent("install duckdb");
+          const params = new URLSearchParams(window.location.search);
+          params.set("send", "install duckdb");
+          window.location.href = `/?${params.toString()}`;
         }}
         className="flex items-center gap-2 px-4 py-2 rounded-lg text-sm font-medium transition-colors cursor-pointer"
         style={{