diff --git a/data/schema/gui.cfg b/data/schema/gui.cfg
index 3d1a1865253..8a01befb1a6 100644
--- a/data/schema/gui.cfg
+++ b/data/schema/gui.cfg
@@ -9,6 +9,7 @@
         max="1"
         {./gui/generic.cfg}
         {./gui/widget_instances.cfg}
+        {./gui/window.cfg}
         [tag]
             name="gui"
             min="0"
@@ -20,8 +21,13 @@
                 {REQUIRED_KEY "source" t_string}
                 {REQUIRED_KEY "text" t_string}
             [/tag]
+            [tag]
+                name="window"
+                min=0
+                max=infinite
+                super="$window"
+            [/tag]
             {./gui/widget_definitions.cfg}
-            {./gui/window.cfg}
             {REQUIRED_KEY "description" string}
             {REQUIRED_KEY "id" string}
         [/tag]
diff --git a/data/schema/gui/window.cfg b/data/schema/gui/window.cfg
index 561fbfbb19d..bca2cda1567 100644
--- a/data/schema/gui/window.cfg
+++ b/data/schema/gui/window.cfg
@@ -1,6 +1,6 @@
 
 [tag]
-    name="window"
+    name="$window"
     min="0"
     max="infinite"
     [tag]
@@ -21,7 +21,7 @@
             name="helptip"
             min="0"
             max="1"
-            super="gui/window/resolution/tooltip"
+            super="$window/resolution/tooltip"
         [/tag]
         [tag]
             name="linked_group"
diff --git a/data/schema/gui_window.cfg b/data/schema/gui_window.cfg
new file mode 100644
index 00000000000..1cec14026e6
--- /dev/null
+++ b/data/schema/gui_window.cfg
@@ -0,0 +1,18 @@
+{./macros.cfg}
+[wml_schema]
+    {./types/basic.cfg}
+    {./types/formula.cfg}
+    {./types/gui.cfg}
+    [tag]
+        name="root"
+        min="1"
+        max="1"
+        {./gui/generic.cfg}
+        {./gui/widget_instances.cfg}
+        {./gui/window.cfg}
+        [+tag]
+            name="$window"
+        [/tag]
+        {LINK_TAG "$window/resolution"}
+    [/tag]
+[/wml_schema]
diff --git a/utils/CI/schema_validation.sh b/utils/CI/schema_validation.sh
index f35b3607473..21fb18e3857 100755
--- a/utils/CI/schema_validation.sh
+++ b/utils/CI/schema_validation.sh
@@ -76,7 +76,7 @@ validate_schema "Game Config"  "game_config"  || RET=1
 validate_schema "GUI2"         "gui"          || RET=1
 validate_schema "Server Pbl"   "pbl"          || RET=1
 validate_schema "WML Diff"     "diff"         || RET=1
-validate_schema "Achievements schema" "achievements" || RET=1
+validate_schema "Achievements" "achievements" || RET=1
 
 validate_core "Core" || RET=1