diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js
index 1731c8aa8..ea09669b0 100644
--- a/dev/View/User/MailBox/FolderList.js
+++ b/dev/View/User/MailBox/FolderList.js
@@ -4,6 +4,7 @@ import { Scope } from 'Common/Enums';
 import { leftPanelDisabled, moveAction } from 'Common/Globals';
 import { mailBox, settings } from 'Common/Links';
 import { setFolderHash } from 'Common/Cache';
+import { addComputablesTo } from 'Common/Utils';
 
 import { AppUserStore } from 'Stores/User/App';
 import { SettingsUserStore } from 'Stores/User/Settings';
@@ -38,7 +39,11 @@ export class MailFolderList extends AbstractViewLeft {
 
 		this.allowContacts = AppUserStore.allowContacts();
 
-		this.folderListFocused = ko.computed(() => Scope.FolderList === AppUserStore.focusedState());
+		addComputablesTo(this, {
+			folderListFocused: () => Scope.FolderList === AppUserStore.focusedState(),
+
+			folderListVisible: () => FolderUserStore.folderList().filter(v => !v.hidden())
+		});
 	}
 
 	onBuild(dom) {
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
index 33ccfb10e..a8a942a91 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
@@ -9,7 +9,7 @@
 	<div class="b-content">
 		<ul class="b-folders-system" data-bind="template: { name: 'MailFolderListSystemItem', foreach: folderListSystem }"></ul>
 		<hr/>
-		<ul class="b-folders-user" data-bind="template: { name: 'MailFolderListItem', foreach: folderList }"></ul>
+		<ul class="b-folders-user" data-bind="template: { name: 'MailFolderListItem', foreach: folderListVisible }"></ul>
 		<div class="move-action-content-wrapper" data-bind="visible: moveAction"></div>
 	</div>
 	<div class="b-content show-on-panel-disabled" data-bind="click: function () { leftPanelDisabled(false); }"></div>