diff --git a/cpu/kinetis/periph/gpio.c b/cpu/kinetis/periph/gpio.c
index 03256dc553..c1ae258a99 100644
--- a/cpu/kinetis/periph/gpio.c
+++ b/cpu/kinetis/periph/gpio.c
@@ -28,6 +28,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include "cpu.h"
+#include "bitarithm.h"
 #include "bit.h"
 #include "periph/gpio.h"
 
@@ -308,20 +309,27 @@ static inline void irq_handler(PORT_Type *port, int port_num)
     /* take interrupt flags only from pins which interrupt is enabled */
     uint32_t status = port->ISFR;
 
-    for (int i = 0; i < 32; i++) {
-        if ((status & (1u << i)) && (port->PCR[i] & PORT_PCR_IRQC_MASK)) {
-            port->ISFR = (1u << i);
-            int ctx = get_ctx(port_num, i);
-            isr_ctx[ctx].cb(isr_ctx[ctx].arg);
+    while (status) {
+        /* get position of first bit set in status */
+        unsigned pin = bitarithm_lsb(status);
+        /* clear it */
+        status &= ~(1 << pin);
+        if (port->PCR[pin] & PORT_PCR_IRQC_MASK) {
+            port->ISFR = (1u << pin);
+            int ctx = get_ctx(port_num, pin);
+            gpio_cb_t cb = isr_ctx[ctx].cb;
+            if (cb) {
+                cb(isr_ctx[ctx].arg);
+            }
         }
     }
-    cortexm_isr_end();
 }
 
 #ifdef PORTA_BASE
 void isr_porta(void)
 {
     irq_handler(PORTA, 0);
+    cortexm_isr_end();
 }
 #endif /* PORTA_BASE */
 
@@ -329,6 +337,7 @@ void isr_porta(void)
 void isr_portb(void)
 {
     irq_handler(PORTB, 1);
+    cortexm_isr_end();
 }
 #endif /* ISR_PORT_B */
 
@@ -336,6 +345,7 @@ void isr_portb(void)
 void isr_portc(void)
 {
     irq_handler(PORTC, 2);
+    cortexm_isr_end();
 }
 #endif /* ISR_PORT_C */
 
@@ -343,6 +353,7 @@ void isr_portc(void)
 void isr_portd(void)
 {
     irq_handler(PORTD, 3);
+    cortexm_isr_end();
 }
 #endif /* ISR_PORT_D */
 
@@ -350,6 +361,7 @@ void isr_portd(void)
 void isr_porte(void)
 {
     irq_handler(PORTE, 4);
+    cortexm_isr_end();
 }
 #endif /* ISR_PORT_E */
 
@@ -357,6 +369,7 @@ void isr_porte(void)
 void isr_portf(void)
 {
     irq_handler(PORTF, 5);
+    cortexm_isr_end();
 }
 #endif /* ISR_PORT_F */
 
@@ -364,6 +377,7 @@ void isr_portf(void)
 void isr_portg(void)
 {
     irq_handler(PORTG, 6);
+    cortexm_isr_end();
 }
 #endif /* ISR_PORT_G */
 
@@ -373,6 +387,7 @@ void isr_portb_portc(void)
 {
     irq_handler(PORTB, 1);
     irq_handler(PORTC, 2);
+    cortexm_isr_end();
 }
 #endif
 #endif /* MODULE_PERIPH_GPIO_IRQ */