From 663fb1485a795c2ff3fafc94766a732930a025c3 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 17 May 2022 12:18:49 +0200
Subject: [PATCH] Resolve #400

---
 dev/Sieve/Model/Filter.js                              |  1 -
 dev/Sieve/View/Filter.js                               | 10 ++--------
 .../v/0.0.0/app/templates/Views/User/PopupsFilter.html |  4 ++--
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/dev/Sieve/Model/Filter.js b/dev/Sieve/Model/Filter.js
index 809e0030d..220532fe7 100644
--- a/dev/Sieve/Model/Filter.js
+++ b/dev/Sieve/Model/Filter.js
@@ -40,7 +40,6 @@ export class FilterModel extends AbstractModel {
 
 			name: '',
 			nameError: false,
-			nameFocused: false,
 
 			conditionsType: FilterRulesType.Any,
 
diff --git a/dev/Sieve/View/Filter.js b/dev/Sieve/View/Filter.js
index 9c3a5493b..6c623a2e9 100644
--- a/dev/Sieve/View/Filter.js
+++ b/dev/Sieve/View/Filter.js
@@ -186,19 +186,13 @@ export class FilterPopupView extends rl.pluginPopupView {
 
 	beforeShow(oFilter, fTrueCallback, bEdit) {
 //	onShow(oFilter, fTrueCallback, bEdit) {
+		this.populateOptions();
+
 		this.isNew(!bEdit);
 
 		this.fTrueCallback = fTrueCallback;
 		this.filter(oFilter);
 
 		this.selectedFolderValue(oFilter.actionValue());
-
-		bEdit || oFilter.nameFocused(true);
-
-		this.populateOptions();
-	}
-
-	afterShow() {
-		this.isNew() && this.filter().nameFocused(true);
 	}
 }
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
index a5e11b1bd..80f1a06f3 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
@@ -8,8 +8,8 @@
 <div class="modal-body" data-bind="with: filter">
 	<div class="control-group" data-bind="css: {'error': nameError}">
 		<input type="text" class="span5"
-			data-bind="value: name, hasfocus: nameFocused"
-			autocorrect="off" autocapitalize="off" spellcheck="false"
+			data-bind="value: name"
+			autofocus="" autocorrect="off" autocapitalize="off" spellcheck="false"
 			data-i18n="[placeholder]GLOBAL/NAME">
 	</div>