diff --git a/common/content/commandline.js b/common/content/commandline.js
index 6a271778..d81e6b9e 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -1148,6 +1148,7 @@ const CommandLine = Module("commandline", {
 
             // Reset the caret to one position after the completion.
             this.caret = this.prefix.length + completion.length;
+            this._caret = this.caret;
         },
 
         get caret() this.editor.selection.focusOffset,
@@ -1333,6 +1334,10 @@ const CommandLine = Module("commandline", {
 
         tab: function tab(reverse, wildmode) {
             commandline._autocompleteTimer.flush();
+            if (this._caret != this.caret)
+                this.reset();
+            this._caret = this.caret;
+
             // Check if we need to run the completer.
             if (this.context.waitingForTab || this.wildIndex == -1)
                 this.complete(true, true);
diff --git a/pentadactyl/TODO b/pentadactyl/TODO
index bb40b9a1..19ea7b43 100644
--- a/pentadactyl/TODO
+++ b/pentadactyl/TODO
@@ -24,8 +24,6 @@ BUGS:
 - the :help version-information page is no longer generated
 
 (recent Mercurial regressions):
-9 One of the recent completion fixes seems to have broken the caret
-  position update. BLOCKER.
 9 about:pentadactyl is currently about:undefined
 
 - visual caret mode is broken, requires a manual page focus first anyway or