diff --git a/applications/main/nfc/scenes/nfc_scene_set_type.c b/applications/main/nfc/scenes/nfc_scene_set_type.c
index e33660080..ff82587df 100644
--- a/applications/main/nfc/scenes/nfc_scene_set_type.c
+++ b/applications/main/nfc/scenes/nfc_scene_set_type.c
@@ -53,6 +53,15 @@ bool nfc_scene_set_type_on_event(void* context, SceneManagerEvent event) {
             nfc_scene_set_type_init_edit_data(instance->iso14443_3a_edit_data, 4);
             scene_manager_next_scene(instance->scene_manager, NfcSceneSetSak);
             consumed = true;
+        } else if(
+            (event.event == NfcDataGeneratorTypeMfClassic1k_4b) ||
+            (event.event == NfcDataGeneratorTypeMfClassic1k_7b) ||
+            (event.event == NfcDataGeneratorTypeMfClassic4k_4b) ||
+            (event.event == NfcDataGeneratorTypeMfClassic4k_7b) ||
+            (event.event == NfcDataGeneratorTypeMfClassicMini)) {
+            nfc_data_generator_fill_data(event.event, instance->nfc_device);
+            scene_manager_next_scene(instance->scene_manager, NfcSceneSetUid);
+            consumed = true;
         } else {
             nfc_data_generator_fill_data(event.event, instance->nfc_device);
             scene_manager_set_scene_state(