diff --git a/Assets/Content/Application/Menues/MainMenu/UXML_Application_MainMenu.uxml b/Assets/Content/Application/Menues/MainMenu/UXML_Application_MainMenu.uxml
index 59640233e2780f03cf71acb803524986c57199d8..016e669fb895404688d5245357bfdb0be972af13 100644
--- a/Assets/Content/Application/Menues/MainMenu/UXML_Application_MainMenu.uxml
+++ b/Assets/Content/Application/Menues/MainMenu/UXML_Application_MainMenu.uxml
@@ -2,12 +2,12 @@
     <Style src="project://database/Assets/Content/Application/USS_Application.uss?fileID=7433441132597879392&amp;guid=8fb5305fb619fcf459ff59dd9b1b9dc3&amp;type=3#USS_Application" />
     <Retropair.UXML.PageView active-index="0" data-source="project://database/Assets/Content/Application/Menues/MainMenu/MainMenu.asset?fileID=11400000&amp;guid=35be3af0c31d4fc41b4253df31b224c8&amp;type=2#MainMenu" name="MainMenu">
         <ui:VisualElement name="StartScreen">
-            <Retropair.UXML.PageButton page-name="ModeSelect" name="Start">
+            <Retropair.UXML.PageButton page-name="ModeSelect" name="Start" page-index="1">
                 <Bindings>
                     <UnityEngine.Localization.LocalizedString property="text" table="GUID:a3a3f09de9c22cd46b66f971b37eb38d" entry="Id(307161821184)" />
                 </Bindings>
             </Retropair.UXML.PageButton>
-            <Retropair.UXML.PageButton page-name="Credits" name="Credits">
+            <Retropair.UXML.PageButton page-name="Credits" name="Credits" page-index="2">
                 <Bindings>
                     <UnityEngine.Localization.LocalizedString property="text" table="GUID:a3a3f09de9c22cd46b66f971b37eb38d" entry="Id(212601237504)" />
                 </Bindings>
diff --git a/Assets/Scripts/Runtime/UXML/PageButton.cs b/Assets/Scripts/Runtime/UXML/PageButton.cs
index d710db15c16eac11c121858ef3c7590f1ea65544..4174046d16cf03baa9a9271ff1b1dea80b818169 100644
--- a/Assets/Scripts/Runtime/UXML/PageButton.cs
+++ b/Assets/Scripts/Runtime/UXML/PageButton.cs
@@ -6,18 +6,12 @@
 namespace Retropair.UXML {
     [UxmlElement]
     sealed partial class PageButton : Button {
-        // Index of the active page
-        int _pageIndex = 0;
-
         [Header("PageButton")]
 
         [UxmlAttribute]
         [CreateProperty]
         [PageIndex]
-        internal int pageIndex {
-            get => _pageIndex;
-            set => SwitchToAttachedPage();
-        }
+        internal int pageIndex { get; set; } = 0;
 
 
         PageView _pageView;