diff --git a/frontend/src/app/main/refs.cljs b/frontend/src/app/main/refs.cljs
index 25c538324..61bfa3983 100644
--- a/frontend/src/app/main/refs.cljs
+++ b/frontend/src/app/main/refs.cljs
@@ -618,13 +618,6 @@
   [id]
   (l/derived #(get % id) workspace-grid-edition))
 
-;; FIXME: remove
-(def current-file-id
-  (l/derived :current-file-id st/state))
-
-(def current-project-id
-  (l/derived :current-project-id st/state))
-
 (def workspace-preview-blend
   (l/derived :workspace-preview-blend st/state))
 
diff --git a/frontend/src/app/main/ui/viewer/inspect/right_sidebar.cljs b/frontend/src/app/main/ui/viewer/inspect/right_sidebar.cljs
index 8d2548007..f55a058c2 100644
--- a/frontend/src/app/main/ui/viewer/inspect/right_sidebar.cljs
+++ b/frontend/src/app/main/ui/viewer/inspect/right_sidebar.cljs
@@ -35,8 +35,8 @@
                      :data local})))
     (let [viewer-data     (deref refs/viewer-data)
           local           (get-in viewer-data [:file :data])
-          id              (deref refs/current-file-id)
-          libraries (:libraries viewer-data)]
+          id              (get local :id)
+          libraries       (:libraries viewer-data)]
       (-> libraries
           (assoc id {:id id
                      :data local})))))
@@ -48,6 +48,7 @@
         objects        (or objects (:objects page))
         shapes         (or shapes
                            (resolve-shapes objects selected))
+
         first-shape    (first shapes)
         page-id        (or page-id (:id page))
         file-id        (or file-id (:id file))