diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp
index 8f5a9843a..5d2e1d9f9 100644
--- a/src/gui/sampleEdit.cpp
+++ b/src/gui/sampleEdit.cpp
@@ -1231,7 +1231,17 @@ void FurnaceGUI::drawSampleEdit() {
               }
             }
 
-            memcpy(dataT,data,sampleTexW*sampleTexH*sizeof(unsigned int));
+            if ((pitch>>2)==sampleTexW) {
+              memcpy(dataT,data,sampleTexW*sampleTexH*sizeof(unsigned int));
+            } else {
+              int srcY=0;
+              int destY=0;
+              for (int i=0; i<sampleTexH; i++) {
+                memcpy(&dataT[destY],&data[srcY],sampleTexW*sizeof(unsigned int));
+                srcY+=sampleTexW;
+                destY+=pitch>>2;
+              }
+            }
             rend->unlockTexture(sampleTex);
             delete[] data;
           }