diff --git a/NEWS b/NEWS
index cf50868c..3bd416b3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 <pre>
 2007-xx-xx:
 	* version 0.6
+	* commandline history now works properly on Windows
+	* filename completion now works on Windows
 	* Fixed search for :open (previously needed to do :o <tab> ONCE to initialize them)
 	* added :set {option}! support to toggle a boolean option's value
 	* added :set all and :set all& support to show the current value of all
diff --git a/chrome/content/vimperator/ui.js b/chrome/content/vimperator/ui.js
index 2f87d4be..3fa02b6e 100644
--- a/chrome/content/vimperator/ui.js
+++ b/chrome/content/vimperator/ui.js
@@ -355,24 +355,32 @@ function CommandLine() //{{{
             /* user pressed UP or DOWN arrow to cycle history completion */
             else if (key == "<Up>" || key == "<Down>")
             {
-                //always reset the tab completion if we use up/down keys
+                event.preventDefault();
+                event.stopPropagation();
+
+                // always reset the tab completion if we use up/down keys
                 completion_index = UNINITIALIZED;
 
-                /* save 'start' position for iterating through the history */
+                // save 'start' position for iterating through the history
                 if (history_index == UNINITIALIZED)
                 {
                     history_index = history.length;
                     history_start = command;
                 }
 
+                // search the history for the first item matching the current
+                // commandline string
                 while (history_index >= -1 && history_index <= history.length)
                 {
                     key == "<Up>" ? history_index-- : history_index++;
-                    if (history_index == history.length) // user pressed DOWN when there is no newer history item
+
+                    // user pressed DOWN when there is no newer history item
+                    if (history_index == history.length)
                     {
                         setCommand(history_start);
                         return;
                     }
+
                     // cannot go past history start/end
                     if (history_index <= -1)
                     {
@@ -393,7 +401,6 @@ function CommandLine() //{{{
                         return;
                     }
                 }
-                vimperator.beep();
             }
 
             /* user pressed TAB to get completions of a command */