diff --git a/RenderSystems/Direct3D11/src/OgreD3D11HLSLProgram.cpp b/RenderSystems/Direct3D11/src/OgreD3D11HLSLProgram.cpp
index edde3ef574f..2ac9f6021d9 100644
--- a/RenderSystems/Direct3D11/src/OgreD3D11HLSLProgram.cpp
+++ b/RenderSystems/Direct3D11/src/OgreD3D11HLSLProgram.cpp
@@ -1171,6 +1171,9 @@ namespace Ogre {
             } // columns
             break;
         case D3D10_SVT_FLOAT:
+            if(d3dDesc.Rows > 1 && mColumnMajorMatrices)
+                std::swap(d3dDesc.Rows, d3dDesc.Columns);
+
             switch(d3dDesc.Rows)
             {
             case 1: