diff --git a/TODO b/TODO
index bea96474..f0fc8133 100644
--- a/TODO
+++ b/TODO
@@ -37,7 +37,7 @@ FEATURES:
 6 make a real one-tab-mode, divert _all_ other targets, possible by setting a firefox option (set popup=0-3)
 6 Shift-Insert in textboxes pastes selection contents
 6 page info support (ctrl-g, g<C-g>)
-5 Use arrow keys in preview window
+5 Use arrow keys in preview window, and ctrl-w+j/k to switch to from preview window
 5 Sort :open completion by date?
 5 make use of the ] and [ keys to e.g. jump to the next heading ]], next image ]i, previous textbox [t and so on
 5 add tag support to adding/deleting bookmarks
diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 54eaf3b5..b7b508bd 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -967,6 +967,7 @@ var g_hint_mappings = [ /*{{{*/
 
 var g_searchengines = [ /*{{{*/
     ["google",    "http://www.google.com/search?num=100&q=%s"],
+    ["lucky",     "http://www.google.com/search?num=100&q=%s&btnI=I'm%20Feeling%20Lucky"],
     ["chefkoch",  "http://www.chefkoch.de/rezept-suche.php?Suchbegriff=%s"],
     ["dewiki",    "http://de.wikipedia.org/wiki/%s"],
     ["discogs",   "http://www.discogs.com/search?type=all&q=%s&btn=Search"],