diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
index cfe4b5bce..669f5eead 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
@@ -224,6 +224,10 @@ class EntryActivity : LockingActivity() {
         }
     }
 
+    override fun finishActivityIfReloadRequested(): Boolean {
+        return true
+    }
+
     override fun viewToInvalidateTimeout(): View? {
         return coordinatorLayout
     }
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishActivity.kt
index f6b8bdc36..795a84145 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishActivity.kt
@@ -58,8 +58,14 @@ abstract class StylishActivity : AppCompatActivity() {
         return true
     }
 
+    open fun finishActivityIfReloadRequested(): Boolean {
+        return false
+    }
+
     open fun reloadActivity() {
-        startActivity(intent)
+        if (!finishActivityIfReloadRequested()) {
+            startActivity(intent)
+        }
         finish()
         overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
     }