diff --git a/js/misc/history.js b/js/misc/history.js
index 24d1b514d..fa655cfa0 100644
--- a/js/misc/history.js
+++ b/js/misc/history.js
@@ -77,9 +77,9 @@ HistoryManager.prototype = {
             this._history[this._history.length - 1] != input) {
 
             this._history.push(input);
-            this._historyIndex = this._history.length;
             this._save();
-        }   
+        }
+        this._historyIndex = this._history.length;
     },
 
     _onEntryKeyPress: function(entry, event) {