diff --git a/src/dialog.c b/src/dialog.c
index 4f48b523f..1ba757318 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -834,13 +834,12 @@ init_dlg (Dlg_head * h)
     h->callback (h, NULL, DLG_INIT, 0, NULL);
     dlg_broadcast_msg (h, WIDGET_INIT, 0);
 
+    dlg_redraw (h);
+
     /* Select the first widget that takes focus */
     while (h->current != NULL && !dlg_focus (h))
         h->current = h->current->next;
 
-    /* Redraw the screen */
-    dlg_redraw (h);
-
     h->ret_value = 0;
     h->running = 1;
 }
diff --git a/src/filegui.c b/src/filegui.c
index f8682f592..232a06d4f 100644
--- a/src/filegui.c
+++ b/src/filegui.c
@@ -363,7 +363,6 @@ file_op_context_create_ui (FileOpContext * ctx, gboolean with_eta,
     /* We will manage the dialog without any help, that's why
        we have to call init_dlg */
     init_dlg (ui->op_dlg);
-    ui->op_dlg->running = 1;
 }
 
 void