1 files changed, 14 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCViewModel.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCViewModel.cs
index e5f13e394..d728b7939 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCViewModel.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCViewModel.cs
@@ -22,7 +22,20 @@ namespace Tango.PPC.Common
 
         public INotificationProvider NotificationProvider { get; private set; }
 
-        public PPCSettings Settings { get; private set; }
+        private PPCSettings _settings;
+        public PPCSettings Settings
+        {
+            get
+            {
+                if (_settings == null)
+                {
+                    _settings = SettingsManager.Default.GetOrCreate<PPCSettings>();
+                }
+
+                return _settings;
+            }
+            private set { _settings = value; }
+        }
 
         public PPCViewModel(IPPCApplicationManager application, IAuthenticationProvider authentication, INavigationManager navigation, INotificationProvider notification)
         {
@@ -30,8 +43,6 @@ namespace Tango.PPC.Common
             AuthenticationProvider = authentication;
             NavigationManager = navigation;
             NotificationProvider = notification;
-
-            Settings = SettingsManager.Default.GetOrCreate<PPCSettings>();
         }
 
         public abstract void OnApplicationStarted();