diff --git a/riscos/sslcert.c b/riscos/sslcert.c
index 91d02365d..11392c7f9 100644
--- a/riscos/sslcert.c
+++ b/riscos/sslcert.c
@@ -85,8 +85,6 @@ void ro_gui_cert_preinitialise(void)
 			wimp_WINDOW_TITLE_ICON |
 			wimp_WINDOW_SIZE_ICON |
 			wimp_WINDOW_TOGGLE_ICON);
-
-	ro_gui_cert_tree_template->flags |= wimp_WINDOW_HSCROLL;
 }
 
 /**
diff --git a/riscos/templates/de b/riscos/templates/de
index 55beb3150..de0edccc1 100644
--- a/riscos/templates/de
+++ b/riscos/templates/de
@@ -2638,7 +2638,7 @@ wimp_window {
   xscroll:0
   yscroll:0
   next:wimp_TOP
-  window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_NEW_FORMAT
+  window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_HSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_NEW_FORMAT
   title_fg:wimp_COLOUR_BLACK
   title_bg:wimp_COLOUR_LIGHT_GREY
   work_fg:wimp_COLOUR_BLACK
diff --git a/riscos/templates/en b/riscos/templates/en
index 42fa9749b..9fbcb96a5 100644
--- a/riscos/templates/en
+++ b/riscos/templates/en
@@ -2794,7 +2794,7 @@ wimp_window {
   xscroll:0
   yscroll:0
   next:wimp_TOP
-  window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_NEW_FORMAT
+  window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_HSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_NEW_FORMAT
   title_fg:wimp_COLOUR_BLACK
   title_bg:wimp_COLOUR_LIGHT_GREY
   work_fg:wimp_COLOUR_BLACK
diff --git a/riscos/templates/fr b/riscos/templates/fr
index 74fe5311f..309773478 100644
--- a/riscos/templates/fr
+++ b/riscos/templates/fr
@@ -2648,7 +2648,7 @@ wimp_window {
   xscroll:0
   yscroll:0
   next:wimp_TOP
-  window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_NEW_FORMAT
+  window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_HSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_NEW_FORMAT
   title_fg:wimp_COLOUR_BLACK
   title_bg:wimp_COLOUR_LIGHT_GREY
   work_fg:wimp_COLOUR_BLACK
diff --git a/riscos/templates/nl b/riscos/templates/nl
index 5a237f7bc..bdd6554ff 100644
--- a/riscos/templates/nl
+++ b/riscos/templates/nl
@@ -2798,7 +2798,7 @@ wimp_window {
   xscroll:0
   yscroll:0
   next:wimp_TOP
-  window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_NEW_FORMAT
+  window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_HSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_NEW_FORMAT
   title_fg:wimp_COLOUR_BLACK
   title_bg:wimp_COLOUR_LIGHT_GREY
   work_fg:wimp_COLOUR_BLACK