diff --git a/src/ag-window.c b/src/ag-window.c
index d4df720..494fbb3 100644
--- a/src/ag-window.c
+++ b/src/ag-window.c
@@ -1654,6 +1654,8 @@ ag_window_init(AgWindow *window)
NULL
);
+ // Fill the house system model and set the combo box on the Edit tab to the
+ // default one
house_system_list = gswe_all_house_systems();
g_list_foreach(house_system_list, (GFunc)ag_window_add_house_system, priv);
g_list_free(house_system_list);
diff --git a/src/resources/ui/ag-window.ui b/src/resources/ui/ag-window.ui
index dfedb9a..7c0c4a3 100644
--- a/src/resources/ui/ag-window.ui
+++ b/src/resources/ui/ag-window.ui
@@ -717,7 +717,7 @@
True
False
house_system_model
- 0
+ 1
5