diff --git a/Ryujinx.Graphics.Gpu/Image/TextureManager.cs b/Ryujinx.Graphics.Gpu/Image/TextureManager.cs
index 56dff9ad6..23416ddd3 100644
--- a/Ryujinx.Graphics.Gpu/Image/TextureManager.cs
+++ b/Ryujinx.Graphics.Gpu/Image/TextureManager.cs
@@ -245,9 +245,20 @@ namespace Ryujinx.Graphics.Gpu.Image
 
             FormatInfo formatInfo = copyTexture.Format.Convert();
 
+            int width;
+
+            if (copyTexture.LinearLayout)
+            {
+                width = copyTexture.Stride / formatInfo.BytesPerPixel;
+            }
+            else
+            {
+                width = copyTexture.Width;
+            }
+
             TextureInfo info = new TextureInfo(
                 address,
-                copyTexture.Width,
+                width,
                 copyTexture.Height,
                 copyTexture.Depth,
                 1,
diff --git a/Ryujinx.Graphics.Texture/LayoutConverter.cs b/Ryujinx.Graphics.Texture/LayoutConverter.cs
index 36ae522b5..ef80144ec 100644
--- a/Ryujinx.Graphics.Texture/LayoutConverter.cs
+++ b/Ryujinx.Graphics.Texture/LayoutConverter.cs
@@ -108,11 +108,8 @@ namespace Ryujinx.Graphics.Texture
         {
             int outOffs = 0;
 
-            int w = width;
-            int h = height;
-
-            w = BitUtils.DivRoundUp(w, blockWidth);
-            h = BitUtils.DivRoundUp(h, blockHeight);
+            int w = BitUtils.DivRoundUp(width,  blockWidth);
+            int h = BitUtils.DivRoundUp(height, blockHeight);
 
             int outStride = BitUtils.AlignUp(w * bytesPerPixel, AlignmentSize);