diff --git a/frontend/src/app/main/fonts.clj b/frontend/src/app/main/fonts.clj
index 4c5d35d94..2688bc743 100644
--- a/frontend/src/app/main/fonts.clj
+++ b/frontend/src/app/main/fonts.clj
@@ -18,10 +18,10 @@
   [variant]
   (cond
     (= "regular" variant)
-    {:name "regular" :weight "400" :style "normal"}
+    {:id "regular" :name "regular" :weight "400" :style "normal"}
 
     (= "italic" variant)
-    {:name "italic" :weight "400" :style "italic"}
+    {:id "italic" :name "italic" :weight "400" :style "italic"}
 
     :else
     (when-let [[a b c] (re-find #"^(\d+)(.*)$" variant)]
diff --git a/frontend/src/app/main/ui/shapes/text/styles.cljs b/frontend/src/app/main/ui/shapes/text/styles.cljs
index 1dfaef189..41e2e29e2 100644
--- a/frontend/src/app/main/ui/shapes/text/styles.cljs
+++ b/frontend/src/app/main/ui/shapes/text/styles.cljs
@@ -103,6 +103,7 @@
 
     (when (and (string? font-id)
                (pos? (alength font-id)))
+      (fonts/ensure-loaded! font-id)
       (let [font (get fontsdb font-id)]
         (let [font-family (or (:family font)
                               (obj/get data "fontFamily"))
diff --git a/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs b/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs
index c1652bffd..30277d568 100644
--- a/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs
@@ -20,7 +20,6 @@
    [app.util.object :as obj]
    [app.main.refs :as refs]
    [app.main.store :as st]
-   [app.main.fonts :as fonts]
    [app.main.data.workspace :as dw]
    [app.main.data.workspace.common :as dwc]
    [app.main.data.workspace.texts :as dwt]
@@ -143,7 +142,7 @@
   [props ref]
   (let [shape (unchecked-get props "shape")
         node-ref (unchecked-get props "node-ref")
-        
+
         {:keys [id x y width height content grow-type]} shape
         zoom     (mf/deref refs/selected-zoom)
         state    (mf/use-state #(parse-content content))