diff --git a/src/commandline_frame.ts b/src/commandline_frame.ts
index b8ce5813..70298720 100644
--- a/src/commandline_frame.ts
+++ b/src/commandline_frame.ts
@@ -172,7 +172,7 @@ export function focus() {
             logger.debug("Consuming buffered page keys", bufferedPageKeys,
                 "initialClInputValue = " + initialClInputValue,
                 "currentClInputValue = " + currentClInputValue);
-            // Native events are assumed to be character keydowns events,
+            // Native events are assumed to be character keydown events,
             // i.e. characters appended at the end of clInput.
             commandline_state.clInput.value =
                 initialClInputValue
diff --git a/src/content/controller_content.ts b/src/content/controller_content.ts
index 33a732c5..eff685dc 100644
--- a/src/content/controller_content.ts
+++ b/src/content/controller_content.ts
@@ -212,7 +212,7 @@ function* ParserController() {
 
                 if (response.exstr) {
                     exstr = response.exstr
-                    if (exstr.startsWith("fillcmdline")) { // TODO That's ugly. I need a way to know if this command is going to open the command line. Is there a better way?
+                    if (exstr === "fillcmdline" || exstr === "fillcmdline_notrail") {
                         logger.debug("Starting buffering of page keys")
                         bufferingPageKeysBeginTime = performance.now()
                         mustBufferPageKeysForClInput = true