diff --git a/Assets/RothenburgAR/Scripts/UI/ColorSelectViewBehaviour.cs b/Assets/RothenburgAR/Scripts/UI/ColorSelectViewBehaviour.cs
index e6e0752..ccd98c7 100644
--- a/Assets/RothenburgAR/Scripts/UI/ColorSelectViewBehaviour.cs
+++ b/Assets/RothenburgAR/Scripts/UI/ColorSelectViewBehaviour.cs
@@ -29,7 +29,7 @@ namespace RothenburgAR.UI
                     UIColorSchemeManager.Instance.SetUiColorScheme(id);
                     if (!UIManager.Instance.StartingUp) SettingsManager.Instance.PersistSettings();
 
-                    if (UIManager.Instance.StartingUp) SwitchToTutorialView();
+                    if (UIManager.Instance.StartingUp) SwitchToFontsizeSelectView();
                     else SwitchToARView();
                 });
 
diff --git a/Assets/RothenburgAR/Scripts/UI/FontsizeSelectViewBehaviour.cs b/Assets/RothenburgAR/Scripts/UI/FontsizeSelectViewBehaviour.cs
index e303881..8551718 100644
--- a/Assets/RothenburgAR/Scripts/UI/FontsizeSelectViewBehaviour.cs
+++ b/Assets/RothenburgAR/Scripts/UI/FontsizeSelectViewBehaviour.cs
@@ -48,7 +48,7 @@ namespace RothenburgAR.UI
         {
             Debug.Log("Switching Font size to '" + Enum.GetName(typeof(FontsizeSetting), setting) + "'");
             FontsizeManager.Instance.CurrentFontsizeSetting = setting;
-            SettingsManager.Instance.PersistSettings();
+            if (!UIManager.Instance.StartingUp) SettingsManager.Instance.PersistSettings();
 
             StateManager sm = TrackerManager.Instance.GetStateManager();
             foreach (var item in sm.GetActiveTrackableBehaviours())
@@ -57,7 +57,8 @@ namespace RothenburgAR.UI
                 teh.OnTrackableStateChanged(TrackableBehaviour.Status.NOT_FOUND, TrackableBehaviour.Status.TRACKED);
             }
 
-            SwitchToARView();
+            if (UIManager.Instance.StartingUp) SwitchToTutorialView();
+            else SwitchToARView();
         }
     }
 }
\ No newline at end of file