diff --git a/app/srv/api/deploy.ts b/app/srv/api/deploy.ts
index 08f78b21..0ecd4d78 100644
--- a/app/srv/api/deploy.ts
+++ b/app/srv/api/deploy.ts
@@ -1,9 +1,8 @@
 import { dir } from "dir";
 import { apiContext } from "service-srv";
-import { g } from "utils/global";
 import { validate } from "uuid";
-import { gzipAsync } from "../ws/sync/entity/zlib";
 import { code } from "../ws/sync/editor/code/util-code";
+import { gzipAsync } from "../ws/sync/entity/zlib";
 
 export const _ = {
   url: "/deploy/:site_id/**",
diff --git a/app/web/src/nova/ed/panel/header/mid/page-picker.tsx b/app/web/src/nova/ed/panel/header/mid/page-picker.tsx
index b0035677..d239d62b 100644
--- a/app/web/src/nova/ed/panel/header/mid/page-picker.tsx
+++ b/app/web/src/nova/ed/panel/header/mid/page-picker.tsx
@@ -5,10 +5,11 @@ import { TopBtn } from "../top-btn";
 export const EdPagePicker = () => {
   const p = useGlobal(EDGlobal, "EDITOR");
 
-  if (p.page.cur.name !== p.page.list[p.page.cur.id].page.name) {
-    p.page.cur.name = p.page.list[p.page.cur.id].page.name;
+  if (p.page.list[p.page.cur.id]) {
+    if (p.page.cur.name !== p.page.list[p.page.cur.id].page.name) {
+      p.page.cur.name = p.page.list[p.page.cur.id].page.name;
+    }
   }
-
   return (
     <TopBtn
       onClick={(e) => {