diff --git a/TODO b/TODO
index 9f28f3fb..fbffd99b 100644
--- a/TODO
+++ b/TODO
@@ -50,6 +50,7 @@
 		- drop the winamp like interface?
 		- Add a download button to get the current playlist in a streamed zip file
 		- Add a upload button to upload media files in a dedicated directory
+		- Perform a search for each key pressed (using a timer, in JS)
 		[desktop]
 		- Better style...
 		- MediaPlayer: move the slider using js (http://redmine.webtoolkit.eu/boards/2/topics/7924?r=8478, http://redmine.emweb.be/boards/2/topics/10994)
diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp
index 10be2979..be39ef1f 100644
--- a/src/ui/LmsApplication.cpp
+++ b/src/ui/LmsApplication.cpp
@@ -206,7 +206,7 @@ LmsApplication::handleAuthEvent(void)
 		Wt::WMenu *menu = new Wt::WMenu(contentsStack);
 		navigation->addMenu(menu, Wt::AlignRight);
 
-		Wt::WLineEdit *searchEdit = new Wt::WLineEdit();
+		LineEdit *searchEdit = new LineEdit(500);
 		navigation->bindWidget("search", searchEdit);
 		searchEdit->setEmptyText("Search...");
 		searchEdit->addStyleClass("navbar-form navbar-nav");
@@ -239,7 +239,7 @@ LmsApplication::handleAuthEvent(void)
 				DbHandler().getLogin().logout();
 		}, std::placeholders::_1));
 
-		searchEdit->changed().connect(std::bind([=] ()
+		searchEdit->timedChanged().connect(std::bind([=] ()
 		{
 			// TODO: check which view is activated and search into it
 			audio->search(searchEdit->text().toUTF8());