diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp
index 6db819e0a..8bf3e7bec 100644
--- a/src/toolbars/ControlToolBar.cpp
+++ b/src/toolbars/ControlToolBar.cpp
@@ -886,7 +886,16 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
 #ifdef EXPERIMENTAL_DA
       shifted = !shifted;
 #endif
-      if(it.First() == NULL)
+      bool hasWave = false;
+      for (auto t = it.First(); t; t = it.Next()) {
+         if (t->GetKind() == Track::Wave) {
+            hasWave = true;
+            break;
+         }
+      }
+      if(!hasWave)
+         // Treat append-record like record, when there was no given wave track
+         // to append onto.
          shifted = false;
 
       double t0 = p->GetSel0();