diff --git a/qrenderdoc/Code/BufferFormatter.cpp b/qrenderdoc/Code/BufferFormatter.cpp
index b7b674abb..808b8fc8a 100644
--- a/qrenderdoc/Code/BufferFormatter.cpp
+++ b/qrenderdoc/Code/BufferFormatter.cpp
@@ -229,7 +229,7 @@ ShaderConstant BufferFormatter::ParseFormatString(const QString &formatString, u
     QString arrayDim = !match.captured(7).isEmpty() ? match.captured(7).trimmed() : lit("[1]");
     arrayDim = arrayDim.mid(1, arrayDim.count() - 2);
 
-    if(!match.captured(5).isEmpty())
+    if(!match.captured(5).isEmpty() && basetype != lit("mat"))
       firstDim.swap(secondDim);
 
     el.type.descriptor.name = match.captured(1) + match.captured(2) + match.captured(3) +
diff --git a/renderdoc/driver/shaders/spirv/spirv_reflect.cpp b/renderdoc/driver/shaders/spirv/spirv_reflect.cpp
index 91a93c388..3d6046b32 100644
--- a/renderdoc/driver/shaders/spirv/spirv_reflect.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_reflect.cpp
@@ -522,7 +522,7 @@ void Reflector::PostParse()
         }
         else if(type.type == DataType::MatrixType)
         {
-          type.name += StringFormat::Fmt("%ux%u", type.matrix().count, type.vector().count);
+          type.name += StringFormat::Fmt("%ux%u", type.vector().count, type.matrix().count);
         }
       }
       else if(type.type == DataType::ImageType)