diff --git a/data/gui/window/language_selection.cfg b/data/gui/window/language_selection.cfg
index ceb79d13b78..5d870c5837b 100644
--- a/data/gui/window/language_selection.cfg
+++ b/data/gui/window/language_selection.cfg
@@ -86,11 +86,32 @@
 									grow_factor = 1
 								 	horizontal_grow = "true"
 
-									[toggle_button]
-										definition = "listbox_text"
-
+									[toggle_panel]
+										definition = "default"
 										return_value_id = "ok"
-									[/toggle_button]
+
+										[grid]
+
+											[row]
+
+												[column]
+													grow_factor = 1
+													horizontal_grow = "true"
+													border = "all"
+													border_size = 5
+
+													[label]
+														id = "language"
+														definition = "default"
+													[/label]
+
+												[/column]
+
+											[/row]
+
+										[/grid]
+
+									[/toggle_panel]
 
 								[/column]
 
diff --git a/src/gui/dialogs/language_selection.cpp b/src/gui/dialogs/language_selection.cpp
index 8c89555a775..25297ba317c 100644
--- a/src/gui/dialogs/language_selection.cpp
+++ b/src/gui/dialogs/language_selection.cpp
@@ -67,10 +67,11 @@ void tlanguage_selection::pre_show(twindow& window)
 	const language_def& current_language = get_language();
 	for(const auto & lang : languages)
 	{
-		string_map item;
-		item.emplace("label", lang.language);
+		std::map<std::string, string_map> data;
 
-		list.add_row(item);
+		data["language"]["label"] = lang.language;
+
+		list.add_row(data);
 		if(lang == current_language) {
 			list.select_row(list.get_item_count() - 1);
 		}