diff --git a/pc/tracker/BpmSpdAddWidget.cpp b/pc/tracker/BpmSpdAddWidget.cpp
index ce5924c3..0852e149 100644
--- a/pc/tracker/BpmSpdAddWidget.cpp
+++ b/pc/tracker/BpmSpdAddWidget.cpp
@@ -27,9 +27,6 @@ BpmSpdAddWidget::BpmSpdAddWidget(Tracker *tracker, PatternEditorPanel *pep) :
   updatebpm();
   updatespd();
   updateadd();
-
-  spd_incbtn.enabled = false;
-  spd_decbtn.enabled = false;
 }
 
 #include "apuram.h"
diff --git a/pc/tracker/SongSettings.h b/pc/tracker/SongSettings.h
index 2720fa2e..f7b2f6d7 100644
--- a/pc/tracker/SongSettings.h
+++ b/pc/tracker/SongSettings.h
@@ -50,7 +50,7 @@ struct SongSettings
   char song_title_str[SONGTITLE_SIZE];
 
   static const constexpr unsigned int MIN_BPM = 32, MAX_BPM = 999, DEFAULT_BPM = 120;
-  static const constexpr unsigned int MIN_SPD = 16, MAX_SPD = 31, DEFAULT_SPD = 16;
+  static const constexpr unsigned int MIN_SPD = 1, MAX_SPD = 16, DEFAULT_SPD = 8;
 
   unsigned int bpm :11;
   unsigned int spd :5;