diff --git a/frontend/src/app/main/data/common.cljs b/frontend/src/app/main/data/common.cljs
index f1ff93055..0036824b1 100644
--- a/frontend/src/app/main/data/common.cljs
+++ b/frontend/src/app/main/data/common.cljs
@@ -367,14 +367,14 @@
     (watch [_ state _]
       (let [team-id (or team-id (:current-team-id state))
             file-id (or file-id (:current-file-id state))
-            ;: FIXME: why not :current-page-id
-            page-id (or page-id
+            page-id (or page-id (:current-page-id state)
                         (dm/get-in state [:workspace-data :pages 0]))
+
             params  (-> (rt/get-params state)
                         (assoc :team-id team-id)
                         (assoc :file-id file-id)
                         (assoc :page-id page-id)
-                        (assoc :layout layout)
+                        (update :layout  #(or layout %))
                         (d/without-nils))]
         (rx/of (rt/nav :workspace params options))))))