diff --git a/fvwm/add_window.c b/fvwm/add_window.c
index 1a4e669b6..7d005a2f6 100644
--- a/fvwm/add_window.c
+++ b/fvwm/add_window.c
@@ -205,8 +205,12 @@ static void setup_window_structure(
 	FW_W(*pfw) = w;
 	if (savewin != NULL)
 	{
+		/* JS: 2024-10-19
+		 * Set initial monitor to NULL, so current monitor can
+		 * be used for placement and finding current desk.
+		 */
+		(*pfw)->m = NULL;
 		(*pfw)->Desk = savewin->Desk;
-		(*pfw)->m = savewin->m;
 		SET_SHADED(*pfw, IS_SHADED(savewin));
 		SET_USED_TITLE_DIR_FOR_SHADING(
 			*pfw, USED_TITLE_DIR_FOR_SHADING(savewin));
@@ -2333,8 +2337,6 @@ FvwmWindow *AddWindow(
 	{
 		rectangle attr_g;
 
-		update_fvwm_monitor(fw);
-
 		if (IS_SHADED(fw))
 		{
 			state_args.do_shade = 1;