diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt
index 8dd7e95df..1f58890f7 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt
@@ -307,7 +307,6 @@ class SettingsFragment : GenericMainFragment() {
                 viewModel.enableVfs()
 
                 dialog.dismiss()
-                findNavController().popBackStack()
             }
         }
 
diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
index eaef19b0c..62a36d08b 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
@@ -335,11 +335,12 @@ class SettingsViewModel
             isVfsEnabled.postValue(enabled)
             if (enabled) {
                 Log.i("$TAG VFS has been enabled")
+                showGreenToast(R.string.settings_security_enable_vfs_success_toast, R.drawable.lock_key)
             }
         } else {
-            showRedToast(R.string.settings_security_enable_vfs_failure_toast, R.drawable.warning_circle)
-            isVfsEnabled.postValue(false)
             Log.e("$TAG Failed to enable VFS!")
+            isVfsEnabled.postValue(false)
+            showRedToast(R.string.settings_security_enable_vfs_failure_toast, R.drawable.warning_circle)
         }
     }
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index aee2eb2ef..3b94ac6e0 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -182,6 +182,7 @@
     <string name="settings_security_enable_vfs_title">Chiffrer tous les fichiers</string>
     <string name="settings_security_enable_vfs_subtitle">Attention, vous ne pourrez pas revenir en arrière !</string>
     <string name="settings_security_enable_vfs_failure_toast">Échec à l\'activation du module d\'encryption</string>
+    <string name="settings_security_enable_vfs_success_toast">Module d\'encryption activé</string>
     <string name="settings_security_enable_vfs_dialog_confirmation_title">Confirmer l\'activation du chiffrement</string>
     <string name="settings_security_enable_vfs_dialog_confirmation_message">Une fois la fonctionnalité activée, toutes les données de l\'application seront chiffrées et accessibles uniquement via celle-ci.\n\nCe changement est irréversible.</string>
     <string name="settings_security_prevent_screenshots_title">Empêcher l\'interface d\'être enregistrée</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8fbc07dc6..f5a9d8c22 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -221,6 +221,7 @@
     <string name="settings_security_enable_vfs_title">Encrypt everything</string>
     <string name="settings_security_enable_vfs_subtitle">Warning: once enabled it can\'t be disabled!</string>
     <string name="settings_security_enable_vfs_failure_toast">Failed to enable encryption module!</string>
+    <string name="settings_security_enable_vfs_success_toast">Encryption module enabled</string>
     <string name="settings_security_enable_vfs_dialog_confirmation_title">Do you really want to encrypt everything?</string>
     <string name="settings_security_enable_vfs_dialog_confirmation_message">Be careful, it can\'t be undone!</string>
     <string name="settings_security_prevent_screenshots_title">Prevent interface from being recorded</string>