diff --git a/LoadingPage.xaml b/LoadingPage.xaml
index b1b3b8454979f08094e7fc16b4d1956066a59c88..72fa68c37aea70fbc142c0205d96be601c8e30c3 100644
--- a/LoadingPage.xaml
+++ b/LoadingPage.xaml
@@ -21,6 +21,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    NavigationCacheMode="Enabled"
       mc:Ignorable="d">
 
     <Grid>
diff --git a/MainPage.xaml b/MainPage.xaml
index 7dc2143019150a8e8367f69df2b1b9a476e204cb..3aae9ae0a3cf2e3d7d97f212e852989d7bad6147 100644
--- a/MainPage.xaml
+++ b/MainPage.xaml
@@ -22,6 +22,7 @@
       xmlns:local="using:RingClientUWP"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      NavigationCacheMode="Enabled"
       mc:Ignorable="d">
 
     <Page.Resources>
diff --git a/MessageTextPage.xaml b/MessageTextPage.xaml
index 791850bc27f6ca6e51a555efc3c13e155dce7d1f..2e9271e7df67a5c41fda269213208efce33a49ac 100644
--- a/MessageTextPage.xaml
+++ b/MessageTextPage.xaml
@@ -7,6 +7,7 @@
     xmlns:ctl="using:RingClientUWP.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    NavigationCacheMode="Enabled"
     mc:Ignorable="d">
 
     <Page.Resources>
diff --git a/RingConsolePanel.xaml b/RingConsolePanel.xaml
index 3538637a211875c429a1eb52bf106d20b2b40916..b6e091568ba33f049ab7858a464c566a473a8738 100644
--- a/RingConsolePanel.xaml
+++ b/RingConsolePanel.xaml
@@ -21,6 +21,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    NavigationCacheMode="Enabled"
       mc:Ignorable="d">
 
     <Grid x:Name="_debugWindowOutputGrid_">
diff --git a/SmartPanel.xaml b/SmartPanel.xaml
index ec02c6f84a6e73d035bae2ff4d7b89970f182ad6..37175b8f855160de67a3f46219e82e6245ea01ed 100644
--- a/SmartPanel.xaml
+++ b/SmartPanel.xaml
@@ -24,6 +24,7 @@
       xmlns:views="using:RingClientUWP.Views"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      NavigationCacheMode="Enabled"
       mc:Ignorable="d">
 
     <Page.Resources>
diff --git a/WelcomePage.xaml b/WelcomePage.xaml
index d4f01f64f8a4501f0d78d15e85da4cfe1943d84e..d8431df5809f52c71b17335dd8c17c641674175d 100644
--- a/WelcomePage.xaml
+++ b/WelcomePage.xaml
@@ -21,6 +21,7 @@
       xmlns:local="using:RingClientUWP"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      NavigationCacheMode="Enabled"
       mc:Ignorable="d">
 
     <Grid x:Name="_welcomePage_"
diff --git a/Wizard.xaml b/Wizard.xaml
index 0b11d97fe9138e698496e75c065559d8d8364835..aad544c25e2fe7dc190c6c91c25c44115f9eb7f9 100644
--- a/Wizard.xaml
+++ b/Wizard.xaml
@@ -5,6 +5,7 @@
     xmlns:local="using:RingClientUWP"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    NavigationCacheMode="Enabled"
     mc:Ignorable="d">
 
     <Grid>