diff --git a/bootloader/common.c b/bootloader/common.c
index c792267afa..906b5e0af7 100644
--- a/bootloader/common.c
+++ b/bootloader/common.c
@@ -34,7 +34,7 @@
    on a button press - currently only the ipod, H10 and Sansa versions do. */
 #if defined(IPOD_ARCH) || defined(IRIVER_H10)  || defined(IRIVER_H10_5GB) \
  || defined(SANSA_E200) || defined(SANSA_C200) || defined(GIGABEAT_F) \
- || defined(PHILIPS_SA9200)
+ || defined(PHILIPS_SA9200) || (CONFIG_CPU == AS3525)
 bool verbose = false;
 #else
 bool verbose = true;
diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c
index e6152c7448..d59e7e7183 100644
--- a/bootloader/sansa_as3525.c
+++ b/bootloader/sansa_as3525.c
@@ -28,6 +28,7 @@
 #include "config.h"
 #include "lcd.h"
 #include "backlight-target.h"
+#include "button-target.h"
 #include "ascodec-target.h"
 #include "common.h"
 #include "storage.h"
@@ -41,7 +42,6 @@ void main(void)
     int buffer_size;
     void(*kernel_entry)(void);
     int ret;
-    int delay;
 
     system_init();
     kernel_init();
@@ -52,9 +52,16 @@ void main(void)
     ascodec_init();  /* Required for backlight on e200v2 */
     _backlight_on();
 
-    delay = 0x3000000;
-    while(delay--); /* show splash screen */
-    reset_screen();
+#if 0 /* remove me when the bootloader can be considered finished */
+    int btn = button_read_device();
+
+    /* Enable bootloader messages if any button is pressed */
+    if (btn)
+#endif
+    {
+        lcd_clear_display();
+        verbose = true;
+    }
 
     asm volatile(
             "mrs r0, cpsr             \n"