diff --git a/src/fenrir/inputDriver/evdev.py b/src/fenrir/inputDriver/evdev.py
index e3320997..2815a818 100644
--- a/src/fenrir/inputDriver/evdev.py
+++ b/src/fenrir/inputDriver/evdev.py
@@ -35,14 +35,16 @@ class driver():
             for fd in r:
                 event = self.iDevices[fd].read_one()            
                 while(event):
-                    self.env['input']['eventBuffer'].append( [self.iDevices[fd], self.uDevices[fd], event])
                     if event.type == evdev.events.EV_KEY:
+                        self.env['input']['eventBuffer'].append( [self.iDevices[fd], self.uDevices[fd], event])
                         if event.code != 0:
                             currMapEvent = self.env['runtime']['inputDriver'].mapEvent(event)
                             if not currMapEvent:
                                 return currMapEvent
                             if currMapEvent['EventState'] in [0,1,2]:
-                                return currMapEvent                           
+                                return currMapEvent
+                    else:
+                        self.writeUInput(self.uDevices[fd], event)                            
                     event = self.iDevices[fd].read_one()                            
         return None