@@ -549,6 +549,7 @@ private string InputLoop()
                 var visualSelectionCommandCount = _visualSelectionCommandCount;
                 var moveToLineCommandCount = _moveToLineCommandCount;
                 var moveToEndOfLineCommandCount = _moveToEndOfLineCommandCount;
+                var editsCount = _edits.Count;
 
                 // We attempt to handle window resizing only once per a keybinding processing, because we assume the
                 // window resizing cannot and shouldn't happen within the processing of a given keybinding.
@@ -614,12 +615,25 @@ private string InputLoop()
                 {
                     if (_anyHistoryCommandCount > 0)
                     {
-                        ClearSavedCurrentLine();
-                        _hashedHistory = null;
-                        _currentHistoryIndex = _history.Count;
+                        // _savedCurrentLine is consumed only if current line has the same content
+                        if (_savedCurrentLine.CommandLine == _buffer.ToString())
+                        {
+                            ClearSavedCurrentLine();
+                            _hashedHistory = null;
+                            _currentHistoryIndex = _history.Count;
+                        }
                     }
                     _anyHistoryCommandCount = 0;
                 }
+                // if (editsCount < _edits.Count)
+                // {
+                //     // if previous line with _currentHistoryIndex range 0 to _history.Count - 1(meaning it was recalled) has been edited
+                //     // it become effectively a new command, so we should reset _currentHistoryIndex
+                //     if (_currentHistoryIndex != _history.Count)
+                //     {
+                //         _currentHistoryIndex = _history.Count;
+                //     }
+                // }
                 if (visualSelectionCommandCount == _visualSelectionCommandCount && _visualSelectionCommandCount > 0)
                 {
                     _visualSelectionCommandCount = 0;