diff --git a/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp b/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp
index 70bb7821c6..453a01bf81 100644
--- a/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp
+++ b/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp
@@ -668,15 +668,20 @@ void FIFOAnalyzer::UpdateDescription()
 
     const auto& vtx_desc = frame_info.objectCPStates[object_nr].vtxDesc;
     const auto& vtx_attr = frame_info.objectCPStates[object_nr].vtxAttr[vat];
-    const u32 vertex_size = VertexLoaderBase::GetVertexSize(vtx_desc, vtx_attr);
+    const auto component_sizes = VertexLoaderBase::GetVertexComponentSizes(vtx_desc, vtx_attr);
 
     u32 i = 3;
     for (u32 vertex_num = 0; vertex_num < vertex_count; vertex_num++)
     {
       text += QLatin1Char{'\n'};
-      // TODO: format each vertex nicely
-      for (u32 vertex_off = 0; vertex_off < vertex_size; vertex_off++)
-        text += QStringLiteral("%1").arg(cmddata[i++], 2, 16, QLatin1Char('0'));
+      for (u32 comp_size : component_sizes)
+      {
+        for (u32 comp_off = 0; comp_off < comp_size; comp_off++)
+        {
+          text += QStringLiteral("%1").arg(cmddata[i++], 2, 16, QLatin1Char('0'));
+        }
+        text += QLatin1Char{' '};
+      }
     }
   }
   else
diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp
index 51f9fda359..b920b16a9d 100644
--- a/Source/Core/VideoCommon/VertexLoaderBase.cpp
+++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp
@@ -97,29 +97,45 @@ private:
   std::vector<u8> buffer_b;
 };
 
-u32 VertexLoaderBase::GetVertexSize(const TVtxDesc& vtx_desc, const VAT& vtx_attr)
+template <class Function>
+static void GetComponentSizes(const TVtxDesc& vtx_desc, const VAT& vtx_attr, Function f)
 {
-  u32 size = 0;
   if (vtx_desc.low.PosMatIdx)
-    size++;
+    f(1);
   for (auto texmtxidx : vtx_desc.low.TexMatIdx)
   {
     if (texmtxidx)
-      size++;
+      f(1);
   }
-  size += VertexLoader_Position::GetSize(vtx_desc.low.Position, vtx_attr.g0.PosFormat,
-                                         vtx_attr.g0.PosElements);
-  size += VertexLoader_Normal::GetSize(vtx_desc.low.Normal, vtx_attr.g0.NormalFormat,
-                                       vtx_attr.g0.NormalElements, vtx_attr.g0.NormalIndex3);
+  const u32 pos_size = VertexLoader_Position::GetSize(vtx_desc.low.Position, vtx_attr.g0.PosFormat,
+                                                      vtx_attr.g0.PosElements);
+  if (pos_size != 0)
+    f(pos_size);
+  const u32 norm_size =
+      VertexLoader_Normal::GetSize(vtx_desc.low.Normal, vtx_attr.g0.NormalFormat,
+                                   vtx_attr.g0.NormalElements, vtx_attr.g0.NormalIndex3);
+  if (norm_size != 0)
+    f(norm_size);
   for (u32 i = 0; i < vtx_desc.low.Color.Size(); i++)
   {
-    size += VertexLoader_Color::GetSize(vtx_desc.low.Color[i], vtx_attr.GetColorFormat(i));
+    const u32 color_size =
+        VertexLoader_Color::GetSize(vtx_desc.low.Color[i], vtx_attr.GetColorFormat(i));
+    if (color_size != 0)
+      f(color_size);
   }
   for (u32 i = 0; i < vtx_desc.high.TexCoord.Size(); i++)
   {
-    size += VertexLoader_TextCoord::GetSize(vtx_desc.high.TexCoord[i], vtx_attr.GetTexFormat(i),
-                                            vtx_attr.GetTexElements(i));
+    const u32 tc_size = VertexLoader_TextCoord::GetSize(
+        vtx_desc.high.TexCoord[i], vtx_attr.GetTexFormat(i), vtx_attr.GetTexElements(i));
+    if (tc_size != 0)
+      f(tc_size);
   }
+}
+
+u32 VertexLoaderBase::GetVertexSize(const TVtxDesc& vtx_desc, const VAT& vtx_attr)
+{
+  u32 size = 0;
+  GetComponentSizes(vtx_desc, vtx_attr, [&size](u32 s) { size += s; });
   return size;
 }
 
@@ -153,6 +169,14 @@ u32 VertexLoaderBase::GetVertexComponents(const TVtxDesc& vtx_desc, const VAT& v
   return components;
 }
 
+std::vector<u32> VertexLoaderBase::GetVertexComponentSizes(const TVtxDesc& vtx_desc,
+                                                           const VAT& vtx_attr)
+{
+  std::vector<u32> sizes;
+  GetComponentSizes(vtx_desc, vtx_attr, [&sizes](u32 s) { sizes.push_back(s); });
+  return sizes;
+}
+
 std::unique_ptr<VertexLoaderBase> VertexLoaderBase::CreateVertexLoader(const TVtxDesc& vtx_desc,
                                                                        const VAT& vtx_attr)
 {
diff --git a/Source/Core/VideoCommon/VertexLoaderBase.h b/Source/Core/VideoCommon/VertexLoaderBase.h
index 2e73fbad1d..3dc03b5ce5 100644
--- a/Source/Core/VideoCommon/VertexLoaderBase.h
+++ b/Source/Core/VideoCommon/VertexLoaderBase.h
@@ -7,6 +7,7 @@
 #include <array>
 #include <memory>
 #include <string>
+#include <vector>
 
 #include "Common/CommonTypes.h"
 #include "VideoCommon/CPMemory.h"
@@ -62,6 +63,7 @@ class VertexLoaderBase
 public:
   static u32 GetVertexSize(const TVtxDesc& vtx_desc, const VAT& vtx_attr);
   static u32 GetVertexComponents(const TVtxDesc& vtx_desc, const VAT& vtx_attr);
+  static std::vector<u32> GetVertexComponentSizes(const TVtxDesc& vtx_desc, const VAT& vtx_attr);
   static std::unique_ptr<VertexLoaderBase> CreateVertexLoader(const TVtxDesc& vtx_desc,
                                                               const VAT& vtx_attr);
   virtual ~VertexLoaderBase() {}