diff --git a/app/build.gradle b/app/build.gradle
index 7db11603b..664509f03 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,7 +48,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.2.14'
+    implementation 'com.simplemobiletools:commons:5.2.15'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0'
     implementation 'androidx.multidex:multidex:2.0.0'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
index f58789dd1..502975d2d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
@@ -53,7 +53,7 @@ class SettingsActivity : SimpleActivity() {
         setupScrollHorizontally()
         setupScreenRotation()
         setupHideSystemUI()
-        setupPasswordProtection()
+        setupHiddenItemPasswordProtection()
         setupAppPasswordProtection()
         setupDeleteEmptyFolders()
         setupAllowPhotoGestures()
@@ -235,14 +235,14 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
-    private fun setupPasswordProtection() {
-        settings_password_protection.isChecked = config.isPasswordProtectionOn
-        settings_password_protection_holder.setOnClickListener {
+    private fun setupHiddenItemPasswordProtection() {
+        settings_hidden_item_password_protection.isChecked = config.isPasswordProtectionOn
+        settings_hidden_item_password_protection_holder.setOnClickListener {
             val tabToShow = if (config.isPasswordProtectionOn) config.protectionType else SHOW_ALL_TABS
             SecurityDialog(this, config.passwordHash, tabToShow) { hash, type, success ->
                 if (success) {
                     val hasPasswordProtection = config.isPasswordProtectionOn
-                    settings_password_protection.isChecked = !hasPasswordProtection
+                    settings_hidden_item_password_protection.isChecked = !hasPasswordProtection
                     config.isPasswordProtectionOn = !hasPasswordProtection
                     config.passwordHash = if (hasPasswordProtection) "" else hash
                     config.protectionType = type
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 27fd9bd44..f2271780d 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -898,7 +898,7 @@
             android:textSize="@dimen/smaller_text_size"/>
 
         <RelativeLayout
-            android:id="@+id/settings_password_protection_holder"
+            android:id="@+id/settings_hidden_item_password_protection_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
@@ -909,7 +909,7 @@
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
-                android:id="@+id/settings_password_protection"
+                android:id="@+id/settings_hidden_item_password_protection"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@null"