diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 8dbe1f26..7f2ad101 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -2016,6 +2016,10 @@ bool DivEngine::isPreviewingSample() {
   return (sPreview.sample>=0 && sPreview.sample<(int)song.sample.size());
 }
 
+int DivEngine::getSamplePreviewSample() {
+  return sPreview.sample;
+}
+
 int DivEngine::getSamplePreviewPos() {
   return sPreview.pos;
 }
diff --git a/src/engine/engine.h b/src/engine/engine.h
index 0c755f8f..3a5b1b04 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -714,6 +714,7 @@ class DivEngine {
 
     // sample preview query
     bool isPreviewingSample();
+    int getSamplePreviewSample();
     int getSamplePreviewPos();
     double getSamplePreviewRate();
 
diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp
index bdfba982..05377169 100644
--- a/src/gui/sampleEdit.cpp
+++ b/src/gui/sampleEdit.cpp
@@ -1676,7 +1676,7 @@ void FurnaceGUI::drawSampleEdit() {
         }
 
         dl->PushClipRect(rectMin,rectMax);
-        if (e->isPreviewingSample()) {
+        if (e->isPreviewingSample() && e->getSamplePreviewSample()==curSample) {
           if (!statusBar2.empty()) {
             statusBar2+=" | ";
           }