diff --git a/src/scripts/lychee.js b/src/scripts/lychee.js
index 79783b8..0a00454 100644
--- a/src/scripts/lychee.js
+++ b/src/scripts/lychee.js
@@ -185,6 +185,7 @@ lychee.load = function() {
 
 		// Show Album
 		if (visible.photo()) view.photo.hide()
+		if (visible.sidebar() && (albumID==='0' || albumID==='f' || albumID==='s' || albumID==='r')) sidebar.toggle()
 		if (album.json && albumID==album.json.id) view.album.title()
 		else album.load(albumID)
 
diff --git a/src/scripts/sidebar.js b/src/scripts/sidebar.js
index 48fb2a9..69d42fa 100644
--- a/src/scripts/sidebar.js
+++ b/src/scripts/sidebar.js
@@ -320,7 +320,7 @@ sidebar.createStructure.album = function(data) {
 
 sidebar.render = function(structure) {
 
-	if (structure==null || structure==='') return false
+	if (structure==null || structure==='' || structure===false) return false
 
 	let html = ''