1 files changed, 9 insertions, 4 deletions

diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
index 428e7bab..7a9d90b4 100644
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
@@ -346,6 +346,11 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             var arr = [];
             var temp = new String(uri);
             while(temp.indexOf("/") != -1){
+
+                if(""+temp === this.pickerModel.currentLogicalDrive){//stop at the logical drive
+                    break;
+                }
+
                 temp = temp.substring(0, temp.lastIndexOf("/"));
 
                 //populate dropdown irrespective of validity
@@ -560,7 +565,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
         enumerable: true,
         writable: false,
         value : function(evt, dirObj){
-                    this.currentURI = dirObj.uri;
+                    this.currentURI = this.pickerModel.currentLogicalDrive = dirObj.uri;
 
                     var status = this.pickerViews()[this.selectedPickerView].call(this, dirObj.uri);//dynamically calls the update function of the current picker view
 
@@ -861,12 +866,12 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                     var dataStore = window.sessionStorage;
                     try {
                         if(this.pickerModel.pickerMode === "write"){
-                            dataStore.setItem('lastSavedFolderURI',escape(""+this.currentURI));
+                            dataStore.setItem('lastSavedFolderURI', encodeURI(""+this.currentURI));
                         }
                         else if(this.pickerModel.inFileMode === true){
-                            dataStore.setItem('lastOpenedFolderURI_fileSelection',escape(""+this.currentURI));
+                            dataStore.setItem('lastOpenedFolderURI_fileSelection',encodeURI(""+this.currentURI));
                         }else if(this.pickerModel.inFileMode === false){
-                            dataStore.setItem('lastOpenedFolderURI_folderSelection',escape(""+this.currentURI));
+                            dataStore.setItem('lastOpenedFolderURI_folderSelection',encodeURI(""+this.currentURI));
                         }
                     }
                     catch(e){