1 files changed, 7 insertions, 4 deletions

diff --git a/firmware/target/arm/system-pp502x.c b/firmware/target/arm/system-pp502x.c
index a03d479444..2b6a801128 100644
--- a/firmware/target/arm/system-pp502x.c
+++ b/firmware/target/arm/system-pp502x.c
@@ -63,16 +63,19 @@ void irq(void)
 {
     if(CURRENT_CORE == CPU) {
         if (CPU_INT_STAT & TIMER1_MASK) {
+            TIMER1();
+        }
+        else if (CPU_INT_STAT & TIMER2_MASK)
+            TIMER2();
 #ifdef SANSA_E200
+        else if (CPU_HI_INT_STAT & GPIO_MASK)
+        {
             if (GPIOF_INT_STAT & 0xff)
                 button_int();
             if (GPIOH_INT_STAT & 0xc0)
                 clickwheel_int();
-#endif
-            TIMER1();
         }
-        else if (CPU_INT_STAT & TIMER2_MASK)
-            TIMER2();
+#endif
     } else {
         if (COP_INT_STAT & TIMER1_MASK)
             TIMER1();