diff --git a/xed/xed-app.c b/xed/xed-app.c
index ffb202c..1ecc587 100644
--- a/xed/xed-app.c
+++ b/xed/xed-app.c
@@ -388,6 +388,15 @@ set_command_line_wait (XedApp *app,
                             (GDestroyNotify)g_object_unref);
 }
 
+static void
+set_command_line_wait_doc (XedDocument *doc,
+                           XedApp      *app)
+{
+    XedTab *tab = xed_tab_get_from_document (doc);
+
+    set_command_line_wait (app, tab);
+}
+
 static void
 open_files (GApplication            *application,
             gboolean                 new_window,
@@ -451,7 +460,7 @@ open_files (GApplication            *application,
 
         if (command_line)
         {
-            g_slist_foreach (loaded, (GFunc)set_command_line_wait, NULL);
+            g_slist_foreach (loaded, (GFunc)set_command_line_wait_doc, XED_APP (application));
         }
         g_slist_free (loaded);
     }