diff --git a/src/fenrir-package/fenrir.py b/src/fenrir-package/fenrir.py
index 223f2c97..37a8415f 100755
--- a/src/fenrir-package/fenrir.py
+++ b/src/fenrir-package/fenrir.py
@@ -31,7 +31,8 @@ class fenrir():
             self.environment, timeout = self.environment['runtime']['inputManager'].getKeyPressed(self.environment)
             self.environment = self.environment['runtime']['commandManager'].getCommandForShortcut(self.environment)
             self.environment = self.environment['runtime']['screenDriver'].analyzeScreen(self.environment, 'onInput')
-            self.environment = self.environment['runtime']['commandManager'].executeTriggerCommands(self.environment, 'onInput')            
+            if not timeout:
+                self.environment = self.environment['runtime']['commandManager'].executeTriggerCommands(self.environment, 'onInput')            
             self.environment = self.environment['runtime']['commandManager'].executeTriggerCommands(self.environment, 'onScreenChanged')        
             if self.environment['commandInfo']['currCommand'] != '':
                 self.handleCommands()