diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c
index 92ef13659..9ca81f29a 100644
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -56,7 +56,7 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
         return true;
     case DesktopGlobalAutoLock:
         if(!loader_is_locked(desktop->loader)) {
-            if(desktop->settings.pin_code.length > 0) {
+            if(desktop->settings.auto_lock_with_pin && desktop->settings.pin_code.length > 0) {
                 desktop_pin_lock(&desktop->settings);
             }
             desktop_lock(desktop);
diff --git a/applications/services/desktop/desktop_settings.h b/applications/services/desktop/desktop_settings.h
index 6285f9c90..93292072f 100644
--- a/applications/services/desktop/desktop_settings.h
+++ b/applications/services/desktop/desktop_settings.h
@@ -54,4 +54,5 @@ typedef struct {
     PinCode pin_code;
     uint8_t is_locked;
     uint32_t auto_lock_delay_ms;
+    bool auto_lock_with_pin;
 } DesktopSettings;
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
index 85042baaa..6253ddacd 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
@@ -39,6 +39,14 @@ static void desktop_settings_scene_start_auto_lock_delay_changed(VariableItem* i
     app->settings.auto_lock_delay_ms = auto_lock_delay_value[index];
 }
 
+static void desktop_settings_scene_start_auto_lock_pin_changed(VariableItem* item) {
+    DesktopSettingsApp* app = variable_item_get_context(item);
+    uint8_t value = variable_item_get_current_value_index(item);
+
+    variable_item_set_current_value_text(item, value ? "ON" : "OFF");
+    app->settings.auto_lock_with_pin = value;
+}
+
 void desktop_settings_scene_start_on_enter(void* context) {
     DesktopSettingsApp* app = context;
     VariableItemList* variable_item_list = app->variable_item_list;
@@ -66,6 +74,16 @@ void desktop_settings_scene_start_on_enter(void* context) {
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, auto_lock_delay_text[value_index]);
 
+    item = variable_item_list_add(
+        variable_item_list,
+        "Auto Lock Pin",
+        2,
+        desktop_settings_scene_start_auto_lock_pin_changed,
+        app);
+
+    variable_item_set_current_value_index(item, app->settings.auto_lock_with_pin);
+    variable_item_set_current_value_text(item, app->settings.auto_lock_with_pin ? "ON" : "OFF");
+
     variable_item_list_set_enter_callback(
         variable_item_list, desktop_settings_scene_start_var_list_enter_callback, app);
     view_dispatcher_switch_to_view(app->view_dispatcher, DesktopSettingsAppViewVarItemList);