diff --git a/frontend/src/app/main/data/workspace/libraries.cljs b/frontend/src/app/main/data/workspace/libraries.cljs
index 4434e3878..4e4e0444b 100644
--- a/frontend/src/app/main/data/workspace/libraries.cljs
+++ b/frontend/src/app/main/data/workspace/libraries.cljs
@@ -516,12 +516,14 @@
   (ptk/reify ::nav-to-component-file
     ptk/WatchEvent
     (watch [_ state _]
-      (let [file    (get-in state [:workspace-libraries file-id])
-            pparams {:project-id (:project-id file)
-                     :file-id (:id file)}
-            qparams {:page-id (first (get-in file [:data :pages]))
-                     :layout :assets}]
-        (rx/of (rt/nav-new-window :workspace pparams qparams))))))
+      (let [file         (get-in state [:workspace-libraries file-id])
+            path-params  {:project-id (:project-id file)
+                          :file-id (:id file)}
+            query-params {:page-id (first (get-in file [:data :pages]))
+                          :layout :assets}]
+        (rx/of (rt/nav-new-window* {:rname :workspace
+                                    :path-params path-params
+                                    :query-params query-params}))))))
 
 (defn ext-library-changed
   [file-id modified-at revn changes]
diff --git a/frontend/src/app/main/ui/dashboard/file_menu.cljs b/frontend/src/app/main/ui/dashboard/file_menu.cljs
index e0c03033b..531df875e 100644
--- a/frontend/src/app/main/ui/dashboard/file_menu.cljs
+++ b/frontend/src/app/main/ui/dashboard/file_menu.cljs
@@ -74,10 +74,12 @@
 
         on-new-tab
         (fn [_]
-          (let [pparams {:project-id (:project-id file)
-                         :file-id (:id file)}
-                qparams {:page-id (first (get-in file [:data :pages]))}]
-            (st/emit! (rt/nav-new-window :workspace pparams qparams))))
+          (let [path-params  {:project-id (:project-id file)
+                              :file-id (:id file)}
+                query-params {:page-id (first (get-in file [:data :pages]))}]
+            (st/emit! (rt/nav-new-window* {:rname :workspace
+                                           :path-params path-params
+                                           :query-params query-params}))))
 
         on-duplicate
         (fn [_]
diff --git a/frontend/src/app/util/router.cljs b/frontend/src/app/util/router.cljs
index 680fa0c05..27bfe4374 100644
--- a/frontend/src/app/util/router.cljs
+++ b/frontend/src/app/util/router.cljs
@@ -110,21 +110,6 @@
 
 (def navigate nav)
 
-(deftype NavigateNewWindow [id path-params query-params]
-  ptk/EffectEvent
-  (effect [_ state _]
-    (let [router (:router state)
-          path   (resolve router id path-params query-params)
-          uri    (-> (u/uri cfg/public-uri)
-                     (assoc :fragment path))
-          name   (str (name id) "-" (:file-id path-params))]
-      (dom/open-new-window (str uri) name))))
-
-(defn nav-new-window
-  ([id] (nav-new-window id nil nil))
-  ([id path-params] (nav-new-window id path-params nil))
-  ([id path-params query-params] (NavigateNewWindow. id path-params query-params)))
-
 (defn nav-new-window*
   [{:keys [rname path-params query-params name]}]
   (ptk/reify ::nav-new-window