diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index b46f8844..5d89ad5b 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -208,7 +208,7 @@ int main(int argc, char **argv)
 			}
 			
 			// update timer, status if necessary etc.
-			Status::trace(!key_pressed);
+			Status::trace(!key_pressed, true);
 
 			if (run_resize_screen)
 			{
diff --git a/src/status.cpp b/src/status.cpp
index e1f4612b..41925693 100644
--- a/src/status.cpp
+++ b/src/status.cpp
@@ -131,7 +131,7 @@ void Status::handleServerError(MPD::ServerError &e)
 
 /*************************************************************************/
 
-void Status::trace(bool update_timer)
+void Status::trace(bool update_timer, bool update_window_timeout)
 {
 	if (update_timer)
 		Timer = boost::posix_time::microsec_clock::local_time();
@@ -149,13 +149,16 @@ void Status::trace(bool update_timer)
 		applyToVisibleWindows(&BaseScreen::update);
 		Statusbar::tryRedraw();
 
-		// set appropriate window timeout
-		int nc_wtimeout = std::numeric_limits<int>::max();
-		applyToVisibleWindows([&nc_wtimeout](BaseScreen *s) {
-			nc_wtimeout = std::min(nc_wtimeout, s->windowTimeout());
-		});
-		wFooter->setTimeout(nc_wtimeout);
-		
+		if (update_window_timeout)
+		{
+			// set appropriate window timeout
+			int nc_wtimeout = std::numeric_limits<int>::max();
+			applyToVisibleWindows([&nc_wtimeout](BaseScreen *s) {
+				nc_wtimeout = std::min(nc_wtimeout, s->windowTimeout());
+			});
+			wFooter->setTimeout(nc_wtimeout);
+		}
+
 		Mpd.idle();
 	}
 }
diff --git a/src/status.h b/src/status.h
index a4ec3178..7a0d4471 100644
--- a/src/status.h
+++ b/src/status.h
@@ -29,8 +29,8 @@ namespace Status {//
 void handleClientError(MPD::ClientError &e);
 void handleServerError(MPD::ServerError &e);
 
-void trace(bool update_timer);
-inline void trace() { trace(true); }
+void trace(bool update_timer, bool update_window_timeout);
+inline void trace() { trace(true, false); }
 void update(int event);
 
 namespace State {//