1 files changed, 13 insertions, 1 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/ViewModels/MainViewVM.cs
index 4a756e7ea..507110942 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/ViewModels/MainViewVM.cs
@@ -63,6 +63,14 @@ namespace Tango.PPC.Storage.ViewModels
             }
         }
 
+        private bool _displayItems;
+        public bool DisplayItems
+        {
+            get { return _displayItems; }
+            set { _displayItems = value; RaisePropertyChangedAuto(); }
+        }
+
+
         public RelayCommand<ExplorerFileItem> FileSelectedCommand { get; set; }
 
         public RelayCommand SaveCommand { get; set; }
@@ -104,6 +112,8 @@ namespace Tango.PPC.Storage.ViewModels
                 {
                     View.EditFileName();
                 }
+
+                DisplayItems = true;
             }
             else
             {
@@ -116,6 +126,8 @@ namespace Tango.PPC.Storage.ViewModels
         public override void OnNavigatedFrom()
         {
             base.OnNavigatedFrom();
+            DisplayItems = false;
+            Request = null;
             Request = new StorageNavigationRequest();
         }
 
@@ -158,7 +170,6 @@ namespace Tango.PPC.Storage.ViewModels
         {
             if (_allow_exit || CurrentPath == StorageProvider.Drive.RootDirectory.FullName)
             {
-                Request = null;
                 return Task.FromResult(true);
             }
             else
@@ -170,6 +181,7 @@ namespace Tango.PPC.Storage.ViewModels
 
         private async void OnFileSelected(ExplorerFileItem fileItem)
         {
+            _selectedItem = fileItem;
             _allow_exit = true;
             await NavigationManager.NavigateBack();
             StorageProvider.SubmitFileSelection(fileItem);