diff --git a/src/gui/editControls.cpp b/src/gui/editControls.cpp
index eb0dedae5..f896b0cc2 100644
--- a/src/gui/editControls.cpp
+++ b/src/gui/editControls.cpp
@@ -1024,7 +1024,7 @@ void FurnaceGUI::drawEditControls() {
         ImGui::SameLine();
         if (ImGui::Button(ICON_FA_PLAY_CIRCLE "##PlayAgain")) {
           e->setRepeatPattern(false);
-          play();
+          play(0);
         }
         if (ImGui::IsItemHovered()) {
           ImGui::SetTooltip(_("Play from the beginning of this pattern"));
@@ -1032,7 +1032,7 @@ void FurnaceGUI::drawEditControls() {
         ImGui::SameLine();
         if (ImGui::Button(ICON_FA_STEP_FORWARD "##PlayRepeat")) {
           e->setRepeatPattern(true);
-          play();
+          play(0);
         }
         if (ImGui::IsItemHovered()) {
           ImGui::SetTooltip(_("Repeat from the beginning of this pattern"));
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 0d7176c43..34343f63f 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -1229,7 +1229,7 @@ void FurnaceGUI::play(int row) {
   memset(lastIns,-1,sizeof(int)*DIV_MAX_CHANS);
   if (followPattern) makeCursorUndo();
   if (!followPattern) e->setOrder(curOrder);
-  if (row>0) {
+  if (row>=0) {
     if (!e->playToRow(row)) {
       showError(_("the song is over!"));
     }
diff --git a/src/gui/gui.h b/src/gui/gui.h
index baf460ee0..7678cf601 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -2997,7 +2997,7 @@ class FurnaceGUI {
   void doUndoInstrument();
   void doRedoInstrument();
 
-  void play(int row=0);
+  void play(int row=-1);
   void setOrder(unsigned char order, bool forced=false);
   void stop();
   void endIntroTune();