diff --git a/ui/index.html b/ui/index.html
index 8b2938a4..2768cb3e 100755
--- a/ui/index.html
+++ b/ui/index.html
@@ -250,8 +250,9 @@ $(function(){
 			DATA_ATTR + '_SETTINGS' in localStorage && loadLocalStorageSettings()
 
 			// XXX this will reload everything...
-			// XXX this might load the wrong marks (not sure)...
-			DATA_ATTR + '_MARKED' in localStorage && loadLocalStorageMarks()
+			(MARKED.length == 0 
+				&& DATA_ATTR + '_MARKED' in localStorage 
+				&& loadLocalStorageMarks())
 
 			updateImages()
 
diff --git a/ui/ui.js b/ui/ui.js
index 033ff7b4..2f59d879 100755
--- a/ui/ui.js
+++ b/ui/ui.js
@@ -684,6 +684,10 @@ function loadDirectory(dfl){
 
 	getter('Path to open', dfl)
 		.done(function(path){
+			// reset the modes...
+			toggleSingleImageMode('off')
+			toggleSingleRibbonMode('off')
+
 			path = path.trim()
 			statusNotify(loadDir(path))
 		})