diff --git a/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java b/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
index 953ade2414..7230b5668c 100644
--- a/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
+++ b/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
@@ -464,6 +464,12 @@ public class RuffyScripter {
 
     // === pump ops ===
     public Menu getCurrentMenu() {
+        // TODO workaround, supposedly fixed in latest ruffy?
+        while (currentMenu == null) {
+            log.error("currentMenu == null, waiting");
+            SystemClock.sleep(500);
+            waitForMenuUpdate();
+        }
         return currentMenu;
     }