diff --git a/src/cpu.rs b/src/cpu.rs
index 237ef622b82478e4fc6f4433c1eaa051cfd5153c..8f9b95ff297a2c6fe2d0fad9059ff7232f2893f9 100644
--- a/src/cpu.rs
+++ b/src/cpu.rs
@@ -127,7 +127,7 @@ impl Cpu {
             self.halted = false;
         }
 
-        if self.ime {
+        if self.ime && self.mmu.ie != 0x00 {
             // @TODO aggregate all of this interrupts in the MMU, as there's
             // a lot of redundant code involved in here which complicates the
             // readability and maybe performance of this code
diff --git a/src/pad.rs b/src/pad.rs
index f99e0a85a2b43b5705845039b9908bbc780609f7..a36940a8f275507cdad9ced69c38a3f873b7da0e 100644
--- a/src/pad.rs
+++ b/src/pad.rs
@@ -115,7 +115,7 @@ impl Pad {
         }
 
         // signals that a JoyPad interrupt is pending to be
-        // handled as a key pressed has been done
+        // handled as a key press has been performed
         self.int_pad = true;
     }