diff --git a/changelog_entries/wc-double-scrollbar-bugfix.md b/changelog_entries/wc-double-scrollbar-bugfix.md
new file mode 100644
index 00000000000..f7b8a65b7f0
--- /dev/null
+++ b/changelog_entries/wc-double-scrollbar-bugfix.md
@@ -0,0 +1,2 @@
+### Multiplayer
+	* Fix World Conquest's Help dialog showing double scrollbars due to the left tree having it's vertical scrollbar disabled. Changed both vertical and horizontal scrollbar modes to automatic.
diff --git a/data/gui/window/achievements_dialog.cfg b/data/gui/window/achievements_dialog.cfg
index e7d48b77e98..c871208f685 100644
--- a/data/gui/window/achievements_dialog.cfg
+++ b/data/gui/window/achievements_dialog.cfg
@@ -45,7 +45,6 @@
 		horizontal_placement = "center"
 
 		maximum_width = 800
-		maximum_height = 600
 
 		[tooltip]
 			id = "tooltip"
@@ -112,7 +111,7 @@
 							id = "achievements_list"
 
 							vertical_scrollbar_mode = "auto"
-							horizontal_scrollbar_mode = "auto"
+							horizontal_scrollbar_mode = "never"
 					
 							[list_definition]