diff --git a/applications/applications.c b/applications/applications.c
index 22a4ea4a..9c014450 100755
--- a/applications/applications.c
+++ b/applications/applications.c
@@ -259,7 +259,7 @@ const FlipperApplication FLIPPER_SETTINGS_APPS[] = {
     {.app = power_settings_app, .name = "Power", .stack_size = 1024, .icon = NULL},
 #endif
 
-#ifdef APP_DESKTOP
+#ifdef SRV_DESKTOP
     {.app = desktop_settings_app, .name = "Desktop", .stack_size = 1024, .icon = NULL},
 #endif
 
diff --git a/applications/archive/scenes/archive_scene_rename.c b/applications/archive/scenes/archive_scene_rename.c
index a5c70fac..315d4cb0 100644
--- a/applications/archive/scenes/archive_scene_rename.c
+++ b/applications/archive/scenes/archive_scene_rename.c
@@ -4,6 +4,7 @@
 #include "../helpers/archive_browser.h"
 
 #define SCENE_RENAME_CUSTOM_EVENT (0UL)
+#define MAX_TEXT_INPUT_LEN 22
 
 void archive_scene_rename_text_input_callback(void* context) {
     ArchiveApp* archive = (ArchiveApp*)context;
@@ -26,7 +27,7 @@ void archive_scene_rename_on_enter(void* context) {
         archive_scene_rename_text_input_callback,
         archive,
         archive->text_store,
-        MAX_NAME_LEN,
+        MAX_TEXT_INPUT_LEN,
         false);
 
     view_dispatcher_switch_to_view(archive->view_dispatcher, ArchiveViewTextInput);