diff --git a/applications/main/ibutton/ibutton_i.h b/applications/main/ibutton/ibutton_i.h
index 077b14807..291e1a3de 100644
--- a/applications/main/ibutton/ibutton_i.h
+++ b/applications/main/ibutton/ibutton_i.h
@@ -32,7 +32,7 @@
 #define IBUTTON_APP_FILENAME_PREFIX "iBtn"
 #define IBUTTON_APP_FILENAME_EXTENSION ".ibtn"
 
-#define IBUTTON_KEY_NAME_SIZE 22
+#define IBUTTON_KEY_NAME_SIZE 29
 
 typedef enum {
     iButtonWriteModeInvalid,
diff --git a/applications/main/ibutton/scenes/ibutton_scene_save_name.c b/applications/main/ibutton/scenes/ibutton_scene_save_name.c
index e6236dc35..7735e284f 100644
--- a/applications/main/ibutton/scenes/ibutton_scene_save_name.c
+++ b/applications/main/ibutton/scenes/ibutton_scene_save_name.c
@@ -18,7 +18,10 @@ void ibutton_scene_save_name_on_enter(void* context) {
 
     if(is_new_file) {
         name_generator_make_auto(
-            ibutton->key_name, IBUTTON_KEY_NAME_SIZE, IBUTTON_APP_FILENAME_PREFIX);
+            ibutton->key_name,
+            IBUTTON_KEY_NAME_SIZE,
+            ibutton_protocols_get_name(
+                ibutton->protocols, ibutton_key_get_protocol_id(ibutton->key)));
     }
 
     text_input_set_header_text(text_input, "Name the key");