diff --git a/src/playlist_editor.cpp b/src/playlist_editor.cpp
index 009eedd9..61c40b3f 100644
--- a/src/playlist_editor.cpp
+++ b/src/playlist_editor.cpp
@@ -44,7 +44,8 @@ PlaylistEditor *myPlaylistEditor;
 
 namespace {
 
-const auto fetch_delay = boost::posix_time::milliseconds(500);
+const int pe_timeout = 250;
+const auto fetch_delay = boost::posix_time::milliseconds(pe_timeout);
 
 size_t LeftColumnStartX;
 size_t LeftColumnWidth;
@@ -207,6 +208,14 @@ void PlaylistEditor::update()
 	}
 }
 
+int PlaylistEditor::windowTimeout()
+{
+	if (Content.reallyEmpty())
+		return pe_timeout;
+	else
+		return Screen<WindowType>::windowTimeout();
+}
+
 bool PlaylistEditor::isContentFiltered()
 {
 	if (Content.isFiltered())
diff --git a/src/playlist_editor.h b/src/playlist_editor.h
index 0183a01e..83818b2b 100644
--- a/src/playlist_editor.h
+++ b/src/playlist_editor.h
@@ -37,6 +37,8 @@ struct PlaylistEditor: Screen<NC::Window *>, Filterable, HasColumns, HasSongs, S
 	virtual void refresh() OVERRIDE;
 	virtual void update() OVERRIDE;
 	
+	virtual int windowTimeout() OVERRIDE;
+
 	virtual void enterPressed() OVERRIDE;
 	virtual void spacePressed() OVERRIDE;
 	virtual void mouseButtonPressed(MEVENT me) OVERRIDE;