diff --git a/src/osd/windows/debugwin.c b/src/osd/windows/debugwin.c
index 228f023e735..c91d08a49e2 100644
--- a/src/osd/windows/debugwin.c
+++ b/src/osd/windows/debugwin.c
@@ -2410,9 +2410,6 @@ void console_create_window(running_machine *machine)
 	info->handle_command = disasm_handle_command;
 	info->handle_key = disasm_handle_key;
 
-	// set up the disassembly view to track the current pc
-	downcast<debug_view_disasm *>(info->view[0].view)->set_expression("curpc");
-
 	// create an edit box and override its key handling
 	info->editwnd = CreateWindowEx(EDIT_BOX_STYLE_EX, TEXT("EDIT"), NULL, EDIT_BOX_STYLE,
 			0, 0, 100, 100, info->wnd, NULL, GetModuleHandle(NULL), NULL);
@@ -2486,6 +2483,9 @@ void console_create_window(running_machine *machine)
 	// recompute the children
 	console_set_cpu(debug_cpu_get_visible_cpu(machine));
 
+	// set up the disassembly view to track the current pc
+	downcast<debug_view_disasm *>(info->view[0].view)->set_expression("curpc");
+
 	// mark the edit box as the default focus and set it
 	info->focuswnd = info->editwnd;
 	SetFocus(info->editwnd);