diff --git a/src/xterm.c b/src/xterm.c
index f1f312a55f5..906709fe99e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2354,7 +2354,7 @@ XTmouse_position (fp, insist, bar_window, part, x, y, time)
 				       /* Child of win.  */
 				       &child);
 
-		if (child == None)
+		if (child == None || child == win)
 		  break;
 
 		win = child;
@@ -5454,6 +5454,8 @@ x_iconify_frame (f)
 
   BLOCK_INPUT;
 
+  FRAME_SAMPLE_VISIBILITY (f);
+
   type = x_icon_type (f);
   if (!NILP (type))
     x_bitmap_icon (f, type);