diff --git a/ui (gen4)/features/location.js b/ui (gen4)/features/location.js
index 99eeeb97..fb80d9d3 100755
--- a/ui (gen4)/features/location.js	
+++ b/ui (gen4)/features/location.js	
@@ -113,7 +113,16 @@ module.Location = core.ImageGridFeatures.Feature({
 		['json',
 			function(res){
 				if(this.location){
-					res.location = JSON.parse(JSON.stringify(this.location))
+					var l = res.location = JSON.parse(JSON.stringify(this.location))
+					
+					// cleanup base_path...
+					Object.keys(res.images).forEach(function(gid){
+						var img = res.images[gid]
+
+						if(l.path == img.base_path){
+							delete img.base_path
+						}
+					})
 				}
 			}],
 		['load',
diff --git a/ui (gen4)/features/ui.js b/ui (gen4)/features/ui.js
index 2772cda1..762014c3 100755
--- a/ui (gen4)/features/ui.js	
+++ b/ui (gen4)/features/ui.js	
@@ -2026,7 +2026,7 @@ var ControlActions = actions.Actions({
 										// silently focus central image...
 										if(that.config['focus-central-image'] == 'silent'){
 											that.data.focusImage(gid)
-											that.ribbons.focusImage(a.current)
+											that.ribbons.focusImage(that.current)
 											
 										// focus central image in a normal manner...
 										} else if(that.config['focus-central-image']){
diff --git a/ui (gen4)/lib/widget/browse.js b/ui (gen4)/lib/widget/browse.js
index c7570f7a..19b8c9ea 100755
--- a/ui (gen4)/lib/widget/browse.js	
+++ b/ui (gen4)/lib/widget/browse.js	
@@ -797,6 +797,13 @@ var BrowserPrototype = {
 			path = this.path2list(path)
 			var selection = path.pop()
 
+		// restore selection if path did not change...
+		} else if(path instanceof Array 
+				&& path.length == this.path.length
+				&& path.filter(function(e, i){ return e != this.path[i] }).length == 0){
+			var selection = this.selected
+
+		// no selection...
 		} else {
 			path = this.path2list(path)
 			var selection = null