diff --git a/dev/Styles/User/FolderList.less b/dev/Styles/User/FolderList.less
index 346cd8039..e229cf0dd 100644
--- a/dev/Styles/User/FolderList.less
+++ b/dev/Styles/User/FolderList.less
@@ -15,7 +15,7 @@
 	}
 
 	input {
-		width: calc(100% - 8px);
+		width: calc(100% - 37px);
 		margin-left: 4px;
 	}
 
diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less
index be28b04c6..df187721c 100644
--- a/dev/Styles/User/MessageList.less
+++ b/dev/Styles/User/MessageList.less
@@ -79,6 +79,13 @@ html.rl-no-preview-pane {
 		padding-right: 8px;
 	}
 
+	.btn.buttonClearFolderSearchInput {
+		font-size: 14px;
+		padding-left: 8px;
+		padding-right: 8px;
+		margin-bottom: 4px;
+	}
+
 	.second-toolbar {
 		display: flex;
 		flex-shrink: 0;
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 104876975..30e5b29eb 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -818,6 +818,10 @@ export class MailMessageList extends AbstractViewRight {
 		showScreenPopup(AdvancedSearchPopupView, [MessagelistUserStore.mainSearch()]);
 	}
 
+	clearFolderSearchClick() {
+		document.getElementById("folderSearchInput").value = "";
+	}
+
 	groupSearch(group) {
 		group.search && MessagelistUserStore.mainSearch(group.search);
 	}
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 aa4958b4c..f657142e0 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
@@ -20,7 +20,8 @@
 			</li>
 		</ul>
 		<hr>
-		<input type="search" data-bind="textInput: foldersFilter, visible: foldersFilterVisible" data-i18n="[placeholder]GLOBAL/SEARCH">
+		<input type="search" id="folderSearchInput" data-bind="textInput: foldersFilter, visible: foldersFilterVisible" data-i18n="[placeholder]GLOBAL/SEARCH">
+		<a data-bind="click: clearFolderSearchClick" class="btn buttonClearFolderSearchInput">✕</a>
 		<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>