diff --git a/src/controller.cpp b/src/controller.cpp
index 473eabc..a40667d 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -12,12 +12,17 @@ void Controller::handle() {
 void Controller::handle_buttons() {
 	if (is_button_pressed(PIN_BTN_VOL_UP)) {
 		log_i("BTN_VOL_UP pressed");
-		uint8_t vol = min(audio.getVolume()+1, 21);
+		uint8_t vol = min(audio.getVolume()+2, 21);
 		log_d("Setting new volume %d", vol);
 		audio.setVolume(vol);
 	} else if (is_button_pressed(PIN_BTN_VOL_DOWN)) {
 		log_i("BTN_VOL_DOWN pressed");
-		uint8_t vol = max(audio.getVolume()-1, 1);
+		uint8_t vol;
+		if ((vol = audio.getVolume()) >= 3) {
+			vol -= 2;
+		} else {
+			vol = 1;
+		}
 		log_d("Setting new volume %d", vol);
 		audio.setVolume(vol);
 	} else if (is_button_pressed(PIN_BTN_TRACK_NEXT)) {