diff --git a/src/xterm.c b/src/xterm.c
index 8079a360cf..4a892b3c3e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9365,6 +9351,11 @@ handle_one_xevent (struct x_display_info *dpyinfo,
       goto OTHER;

     case VisibilityNotify:
+      f = x_top_window_to_frame (dpyinfo, event->xvisibility.window);
+      if (f && (event->xvisibility.state == VisibilityUnobscured
+		|| event->xvisibility.state == VisibilityPartiallyObscured))
+	SET_FRAME_VISIBLE (f, 1);
+
       goto OTHER;

     case MappingNotify: