diff --git a/src/fenrir/commands/onInput/10000-shut_up.py b/src/fenrir/commands/onInput/10000-shut_up.py
index a12c5ba1..b3a2dea7 100644
--- a/src/fenrir/commands/onInput/10000-shut_up.py
+++ b/src/fenrir/commands/onInput/10000-shut_up.py
@@ -23,7 +23,7 @@ class command():
             return
         if self.env['runtime']['screenManager'].isScreenChange():
             return
-        if len(self.env['input']['prevDeepestInput']) > len(self.env['input']['currInput']):
+        if len(self.env['input']['currInput']) <= len(self.env['input']['prevInput']):
             return
         # if the filter is set
         if self.env['runtime']['settingsManager'].getSetting('keyboard', 'interruptOnKeyPressFilter').strip() != '':            
diff --git a/src/fenrir/commands/onScreenUpdate/60000-history.py b/src/fenrir/commands/onScreenUpdate/60000-history.py
index efdbe244..0ecea111 100644
--- a/src/fenrir/commands/onScreenUpdate/60000-history.py
+++ b/src/fenrir/commands/onScreenUpdate/60000-history.py
@@ -24,9 +24,12 @@ class command():
         if self.env['runtime']['cursorManager'].isCursorVerticalMove():
             return
         if not (self.env['runtime']['inputManager'].getLastDeepestInput() in [['KEY_UP'],['KEY_DOWN']]):
-            return            
+            return 
         prevLine = self.env['screen']['oldContentText'].split('\n')[self.env['screen']['newCursor']['y']]
-        currLine = self.env['screen']['newContentText'].split('\n')[self.env['screen']['newCursor']['y']]
+        currLine = self.env['screen']['newContentText'].split('\n')[self.env['screen']['newCursor']['y']]            
+        if prevLine == currLine:
+            if self.env['screen']['newDelta'] != '':
+                return         
         if not currLine.isspace():
             currPrompt = currLine.find('$')
             rootPrompt = currLine.find('#')