diff --git a/frontend/src/app/main/data/workspace/libraries.cljs b/frontend/src/app/main/data/workspace/libraries.cljs
index 92a5f81a4..fd7bd595a 100644
--- a/frontend/src/app/main/data/workspace/libraries.cljs
+++ b/frontend/src/app/main/data/workspace/libraries.cljs
@@ -395,7 +395,7 @@
      (watch [it state _]
        (let [file-id  (:current-file-id state)
              page-id  (:current-page-id state)
-             objects  (dsh/lookup-page-objects state page-id)
+             objects  (dsh/lookup-page-objects state file-id page-id)
              shapes   (dwg/shapes-for-grouping objects selected)
              parents  (into #{} (map :parent-id) shapes)]
          (when-not (empty? shapes)
diff --git a/frontend/src/app/main/data/workspace/path/changes.cljs b/frontend/src/app/main/data/workspace/path/changes.cljs
index 44c38d99d..eb032c68d 100644
--- a/frontend/src/app/main/data/workspace/path/changes.cljs
+++ b/frontend/src/app/main/data/workspace/path/changes.cljs
@@ -6,6 +6,7 @@
 
 (ns app.main.data.workspace.path.changes
   (:require
+   [app.common.data.macros :as dm]
    [app.common.files.changes-builder :as pcb]
    [app.common.types.path :as path]
    [app.main.data.changes :as dch]
@@ -74,10 +75,10 @@
 
      ptk/WatchEvent
      (watch [it state _]
-       (let [objects     (dsh/lookup-page-objects state)
-             page-id     (:current-page-id state)
-             id          (get-in state [:workspace-local :edition])
-             old-content (get-in state [:workspace-local :edit-path id :old-content])
+       (let [page-id     (:current-page-id state)
+             objects     (dsh/lookup-page-objects state page-id)
+             id          (dm/get-in state [:workspace-local :edition])
+             old-content (dm/get-in state [:workspace-local :edit-path id :old-content])
              shape       (st/get-path state)]
 
          (if (and (some? old-content) (some? (:id shape)))
diff --git a/frontend/src/app/main/data/workspace/selection.cljs b/frontend/src/app/main/data/workspace/selection.cljs
index ad37cfeec..e69f10bc6 100644
--- a/frontend/src/app/main/data/workspace/selection.cljs
+++ b/frontend/src/app/main/data/workspace/selection.cljs
@@ -332,11 +332,11 @@
    (ptk/reify ::select-shapes-by-current-selrect
      ptk/WatchEvent
      (watch [_ state _]
-       (let [page-id (:current-page-id state)
-             objects (dsh/lookup-page-objects state)
-             selrect (dm/get-in state [:workspace-local :selrect])
-             blocked? (fn [id] (dm/get-in objects [id :blocked] false))
-             ask-worker (if buffered? mw/ask-buffered! mw/ask!)
+       (let [page-id     (:current-page-id state)
+             objects     (dsh/lookup-page-objects state page-id)
+             selrect     (dm/get-in state [:workspace-local :selrect])
+             blocked?    (fn [id] (dm/get-in objects [id :blocked] false))
+             ask-worker  (if buffered? mw/ask-buffered! mw/ask!)
              filter-objs (comp
                           (filter (complement blocked?))
                           (remove (partial cfh/hidden-parent? objects)))]