diff --git a/src/xterm.c b/src/xterm.c
index 9edaed9a34..b7958f0cd6 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8436,7 +8436,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 		x_set_z_group (f, Qbelow, Qnil);
 	    }

-	  if (not_hidden)
+          if (not_hidden && iconified)
 	    {
 	      SET_FRAME_VISIBLE (f, 1);
 	      SET_FRAME_ICONIFIED (f, false);
@@ -8447,11 +8447,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 		(f, FRAME_PIXEL_WIDTH (f), FRAME_PIXEL_HEIGHT (f));
 #endif
 	      f->output_data.x->has_been_visible = true;
-	    }

-          if (not_hidden && iconified)
-            {
-              inev.ie.kind = DEICONIFY_EVENT;
+	      inev.ie.kind = DEICONIFY_EVENT;
               XSETFRAME (inev.ie.frame_or_window, f);
             }
         }