diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt
index 3e5b45024..e0624f246 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt
@@ -45,6 +45,10 @@ import com.kunzisoft.keepass.utils.LOCK_ACTION
 @RequiresApi(api = Build.VERSION_CODES.O)
 class AutofillLauncherActivity : DatabaseActivity() {
 
+    override fun applyCustomStyle(): Boolean {
+        return false
+    }
+
     override fun onDatabaseRetrieved(database: Database?) {
         super.onDatabaseRetrieved(database)
 
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntrySelectionLauncherActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntrySelectionLauncherActivity.kt
index 09e36e212..5428c2db2 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntrySelectionLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntrySelectionLauncherActivity.kt
@@ -43,6 +43,10 @@ import com.kunzisoft.keepass.settings.PreferencesUtil
  */
 class EntrySelectionLauncherActivity : DatabaseActivity() {
 
+    override fun applyCustomStyle(): Boolean {
+        return false
+    }
+
     override fun onDatabaseRetrieved(database: Database?) {
         super.onDatabaseRetrieved(database)
         var sharedWebDomain: String? = null
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/MagikeyboardLauncherActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/MagikeyboardLauncherActivity.kt
index a43a2aabb..217d85071 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/MagikeyboardLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/MagikeyboardLauncherActivity.kt
@@ -28,6 +28,10 @@ import com.kunzisoft.keepass.database.search.SearchHelper
  */
 class MagikeyboardLauncherActivity : DatabaseActivity() {
 
+    override fun applyCustomStyle(): Boolean {
+        return false
+    }
+
     override fun onDatabaseRetrieved(database: Database?) {
         super.onDatabaseRetrieved(database)
         val readOnly = database?.isReadOnly != false
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 bc140450e..79b18e803 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
@@ -35,6 +35,7 @@ abstract class StylishActivity : AppCompatActivity() {
 
     @StyleRes
     private var themeId: Int = 0
+    private var customStyle = true
 
     /* (non-Javadoc) Workaround for HTC Linkify issues
      * @see android.app.Activity#startActivity(android.content.Intent)
@@ -52,10 +53,18 @@ abstract class StylishActivity : AppCompatActivity() {
         }
     }
 
+    open fun applyCustomStyle(): Boolean {
+        return true
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        this.themeId = Stylish.getThemeId(this)
-        setTheme(themeId)
+
+        customStyle = applyCustomStyle()
+        if (customStyle) {
+            this.themeId = Stylish.getThemeId(this)
+            setTheme(themeId)
+        }
 
         // Several gingerbread devices have problems with FLAG_SECURE
         window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
@@ -63,7 +72,8 @@ abstract class StylishActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        if (Stylish.getThemeId(this) != this.themeId) {
+
+        if (customStyle && Stylish.getThemeId(this) != this.themeId) {
             Log.d(this.javaClass.name, "Theme change detected, restarting activity")
             this.recreate()
         }