diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java b/app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java
index 5f2bf7d83f..c5c794b1e5 100644
--- a/app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java
+++ b/app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java
@@ -105,7 +105,7 @@ public class SetTbrCommand implements Command {
 
                 // confirm TBR
                 scripter.pressCheckKey();
-                SystemClock.sleep(500);
+                scripter.waitForMenuToBeLeft(MenuType.TBR_DURATION);
             }
 
             scripter.verifyMenuIsDisplayed(MenuType.MAIN_MENU,