diff --git a/software/GToE/GToE.ino b/software/GToE/GToE.ino
index f13b416..ed84724 100644
--- a/software/GToE/GToE.ino
+++ b/software/GToE/GToE.ino
@@ -350,14 +350,14 @@ void checkInputs() {
         bpm = MINBPM;
       }
       calculateBPMTiming();
-    } else if (displayTab == 0 && insideTab == 1) {
+    } else if (displayTab == 0 && insideTab == 1) {   //Clock mode
       masterClockMode = masterClockMode + change;
       if (masterClockMode == 3) {
         masterClockMode = 2;
       } else if (masterClockMode == 255) {
         masterClockMode = 0;
       }
-    } else if (displayTab == 0 && insideTab == 2) {
+    } else if (displayTab == 0 && insideTab == 2 && masterClockMode == 0) {  //bpm modulation
       bpmModulationRange = bpmModulationRange + change;
     } else if (displayTab != 0 && insideTab == 0) {         //subdivision
       channels[displayTab-1].mode = channels[displayTab-1].mode - change;
@@ -509,7 +509,7 @@ void updateScreen() {
     }
     display.setCursor(58,30);
     display.print(F(" MOD:"));
-    if (bpmModulationRange != 0) {
+    if (bpmModulationRange != 0 && masterClockMode == 0) {
       display.print(F("CV"));
       display.print(bpmModulationChannel+1);
       display.print("+");