diff --git a/conf/gcs/editor.xml b/conf/gcs/editor.xml
index 9e9c90ce56..b237aeb7cf 100644
--- a/conf/gcs/editor.xml
+++ b/conf/gcs/editor.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE layout SYSTEM "layout.dtd">
 
-<layout width="512" height="384">
+<layout width="650" height="384">
  <rows>
   <widget size="256" name="map2d"/>
   <widget name="editor"/>
diff --git a/sw/ground_segment/cockpit/editFP.ml b/sw/ground_segment/cockpit/editFP.ml
index 8b4b160370..4482832209 100644
--- a/sw/ground_segment/cockpit/editFP.ml
+++ b/sw/ground_segment/cockpit/editFP.ml
@@ -125,7 +125,11 @@ let load_xml_file = fun geomap editor_frame accel_group xml_file ->
   try
     let xml = Xml.parse_file xml_file in
     ignore (load_xml_fp geomap editor_frame accel_group ~xml_file xml);
-    geomap#fit_to_window ()
+    geomap#fit_to_window ();
+    match GWindow.toplevel geomap#canvas with
+      Some w ->
+	w#set_title (sprintf "%s (%s)" w#title (Filename.basename xml_file))
+    | None -> ()
   with
     Dtd.Prove_error(e) -> loading_error xml_file (Dtd.prove_error e)
   | Dtd.Check_error(e) -> loading_error xml_file (Dtd.check_error e)
diff --git a/sw/ground_segment/cockpit/gcs.ml b/sw/ground_segment/cockpit/gcs.ml
index 274f2ef103..b6309972a4 100644
--- a/sw/ground_segment/cockpit/gcs.ml
+++ b/sw/ground_segment/cockpit/gcs.ml
@@ -502,7 +502,8 @@ let _main =
     match !wid with
       None ->
 	let icon = GdkPixbuf.from_file Env.icon_file in
-  	let window = GWindow.window ~icon ~title:"GCS" ~border_width:1 ~width ~height ~allow_shrink:true () in
+	let title = if !edit then "Flight Plan Editor" else "GCS" in
+  	let window = GWindow.window ~icon ~title ~border_width:1 ~width ~height ~allow_shrink:true () in
 	if !maximize then
 	  window#maximize ();
 	if !fullscreen then