diff --git a/Software/Gravity/Interactions.ino b/Software/Gravity/Interactions.ino
index b40ee9f..df3c4d0 100644
--- a/Software/Gravity/Interactions.ino
+++ b/Software/Gravity/Interactions.ino
@@ -404,7 +404,7 @@ void checkInputs() {
     if (isRecording) { //Live triggering
       digitalWrite(outsPins[displayTab - 1], HIGH);
     }
-    if (displayScreen == 1 && !isRecording && stepNumSelected <= sequences[patternToEdit].length) {
+    if (displayScreen == 1 && !isRecording && stepNumSelected <= sequences[patternToEdit].length && stepNumSelected != -1) {
       sequences[patternToEdit].sequence = bitFlip(sequences[patternToEdit].sequence, stepNumSelected);
     } else if (displayScreen == 1 && isRecording && !recordToNextStep) { //Recording
       bitSet(sequences[patternToEdit].sequence, currentStep[displayTab - 1]);
@@ -418,7 +418,7 @@ void checkInputs() {
   } else if (digitalRead(SHIFT_BTN_PIN) && shiftBtnPushed) {
     shiftBtnPushed = false;
     shiftReleasedTime = millis();
-    if (displayScreen == 1 && shiftReleasedTime - shiftPressedTime > 500 && !encBtnPushed) { //&& shiftReleasedTime - shiftPressedTime < 2000 //Clear the sequence
+    if (displayScreen == 1 && shiftReleasedTime - shiftPressedTime > 1000 && !encBtnPushed && stepNumSelected != -1) { //&& shiftReleasedTime - shiftPressedTime < 2000 //Clear the sequence
       sequences[patternToEdit].sequence = 0b000000000000000000000000000000000;
     } else if (shiftReleasedTime - shiftPressedTime > 2000 && encBtnPushed) {
       displayScreen = 2;