diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index 701ef04127..0a2a57e37b 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -1683,7 +1683,7 @@ BWindow::UpdateIfNeeded()
 
 	BMessage *msg;
 	for (int32 i = 0; (msg = queue->FindMessage(i)) != NULL; i++) {
-		if (msg->what == _UPDATE_) {
+		if (msg->what == _UPDATE_ || msg->what == B_WINDOW_ACTIVATED) {
 			BWindow::DispatchMessage(msg, this);
 				// we need to make sure that no overridden method is called 
 				// here; for BWindow::DispatchMessage() we now exactly what