diff --git a/apps/main.c b/apps/main.c
index b69275be7f..fd9b3760bf 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -77,6 +77,8 @@ void init(void)
                global_settings.loudness,
                global_settings.bass_boost,
                global_settings.avc );
+    while (button_get(false) != 0)
+      ; /* Empty the keyboard buffer */
 }
 
 #else
diff --git a/apps/tree.c b/apps/tree.c
index a8d72f4488..dcaa9558bd 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -511,21 +511,8 @@ bool ask_resume(void)
 #endif
     lcd_update();
 
-#ifdef SIMULATOR
-    {
-        /* Special code for SIMULATOR because it might return the 
-           "enter"-keyrelease of the shell when starting the simulator. */
-        unsigned short key;
-        do  {
-            key=button_get(true);
-            if (key == BUTTON_PLAY)
-                return true;
-        } while (key & BUTTON_REL);
-    }
-#else
     if (button_get(true) == BUTTON_PLAY)
         return true;
-#endif
     return false;
 }