diff --git a/include/pd/lithium/drawlist.hpp b/include/pd/lithium/drawlist.hpp
index 807882d..21a752f 100644
--- a/include/pd/lithium/drawlist.hpp
+++ b/include/pd/lithium/drawlist.hpp
@@ -45,6 +45,8 @@ class PD_API Drawlist {
 
   /** Command Allocation */
   Command& NewCommand();
+  bool HasCommands() { return pCommands.size() > 0; }
+  Command& GetLastCommand() { return pCommands[pCommands.size() - 1]; }
 
   /** Path API */
   void PathAdd(const fvec2& point) { pPath.Push(point); }
diff --git a/include/pd/lithium/vertex.hpp b/include/pd/lithium/vertex.hpp
index ab888b5..4bb8687 100755
--- a/include/pd/lithium/vertex.hpp
+++ b/include/pd/lithium/vertex.hpp
@@ -9,6 +9,8 @@ class Vertex {
   Vertex() {}
   Vertex(const fvec2& pos, const fvec2& uv, u32 color)
       : pos(pos), uv(uv), color(color) {}
+  Vertex(float x, float y, float u, float v, u32 color)
+      : pos(x, y), uv(u, v), color(color) {}
   ~Vertex() {}
 
   void Reset() {
diff --git a/source/lithium/font.cpp b/source/lithium/font.cpp
index a7a7955..13e76f9 100644
--- a/source/lithium/font.cpp
+++ b/source/lithium/font.cpp
@@ -207,6 +207,17 @@ PD_API fvec2 Font::GetTextBounds(const char* text, float scale) {
   return res;
 }
 
+PD_API void PrimTextQuad(Command& cmd, float x, float y, float w, float h,
+                         const fvec4& uv, const PD::Color& color) {
+  cmd.Reserve(4, 6);
+  cmd.Add(2, 1, 0);
+  cmd.Add(3, 2, 0);
+  cmd.Add(Vertex(x, y, uv.x, uv.y, color));
+  cmd.Add(Vertex(x + w, y, uv.z, uv.y, color));
+  cmd.Add(Vertex(x + w, y + h, uv.z, uv.w, color));
+  cmd.Add(Vertex(x, y + h, uv.x, uv.w, color));
+}
+
 PD_API void Font::CmdTextEx(Drawlist& dl, const fvec2& pos, u32 color,
                             float scale, const char* text, LiTextFlags flags,
                             const fvec2& box) {
@@ -225,7 +236,7 @@ PD_API void Font::CmdTextEx(Drawlist& dl, const fvec2& pos, u32 color,
 
   U8Iterator it(text);
   u32 c;
-  Command* cmd = nullptr;
+  Command* cmd = dl.HasCommands() ? &dl.GetLastCommand() : nullptr;
   while (it.Decode32(c)) {
     auto cp = GetCodepoint(c);
     if ((cp.pInvalid && c != L'\n' && c != L'\t' && c != L' ') && c != L'\r')
@@ -252,15 +263,20 @@ PD_API void Font::CmdTextEx(Drawlist& dl, const fvec2& pos, u32 color,
       cmd->Tex = Textures[cp.Tex];
     }
 
-    if (flags & LiTextFlags_Shaddow) {
-      Rect rec = Math::PrimRect(rpos + off + fvec2(1, cp.Offset * cfs + 1),
-                                cp.Size * cfs, 0.f);
-      dl.PrimQuad(*cmd, rec, cp.SimpleUV, 0xff111111);
-    }
+    // calculating once and using PrimTextQuad to directly push
+    // saves ~42% on raw multiline text draw time 6.3 -> 3.7 ms
+    // and ~25% on the whole frametime 20.3 -> 15.2 ms
+    // tested with Craftus-Next 0.8.0 commit:
+    // 33298ccc276bf996d341710e69ecf05f99c57961
+    float cw = cp.Size.x * cfs;
+    float ch = cp.Size.y * cfs;
+    float cx = rpos.x + off.x;
+    float cy = rpos.y + off.y + (cp.Offset * cfs);
 
-    Rect rec = Math::PrimRect(rpos + off + fvec2(0, cp.Offset * cfs),
-                              cp.Size * cfs, 0.f);
-    dl.PrimQuad(*cmd, rec, cp.SimpleUV, color);
+    if (flags & LiTextFlags_Shaddow) {
+      PrimTextQuad(*cmd, cx + 1.f, cy + 1.f, cw, ch, cp.SimpleUV, 0xff111111);
+    }
+    PrimTextQuad(*cmd, cx, cy, cw, ch, cp.SimpleUV, color);
 
     off.x += cp.Size.x * cfs + 2 * cfs;
   }