diff --git a/common/content/ui.js b/common/content/ui.js
index 6e99e135..43498d80 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -1354,8 +1354,10 @@ function CommandLine() //{{{
 
         updateMorePrompt: function updateMorePrompt(force, showHelp)
         {
-            if (modes.main == modes.COMMAND_LINE)
+            // prevent MOW events (still useful) from wiping out the command-line when in EX extended mode
+            if (modes.extended != modes.OUTPUT_MULTILINE)
                 return;
+
             let win = multilineOutputWidget.contentWindow;
             function isScrollable() !win.scrollMaxY == 0;
             function atEnd() win.scrollY / win.scrollMaxY >= 1;
diff --git a/vimperator/TODO b/vimperator/TODO
index dbd8b8ad..5adec031 100644
--- a/vimperator/TODO
+++ b/vimperator/TODO
@@ -25,7 +25,6 @@ BUGS:
 - Form elements in iframes must be selected twice, whether by tabbing or
   clicking.
 - :regressions is broken, also now blanks the MOW when run
-- more prompt now reads "-- More --" at the end of multipage output when there is no more content
 
 FEATURES:
 9 adaptive timeout for auto-completions, :set completions can be updated more often than