diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_main.c b/applications/settings/xtreme_app/scenes/xtreme_app_scene_main.c
index b7b5f7294..a1c83db1a 100644
--- a/applications/settings/xtreme_app/scenes/xtreme_app_scene_main.c
+++ b/applications/settings/xtreme_app/scenes/xtreme_app_scene_main.c
@@ -12,6 +12,7 @@ static void xtreme_app_scene_main_asset_pack_changed(VariableItem* item) {
         XTREME_SETTINGS()->asset_pack,
         index == 0 ? "" : *asset_packs_get(app->asset_packs, index - 1),
         MAX_PACK_NAME_LEN);
+    app->asset_pack = index;
     app->save_settings = true;
     app->require_reboot = true;
 }
@@ -162,63 +163,15 @@ void xtreme_app_scene_main_on_enter(void* context) {
     VariableItem* item;
     uint8_t value_index;
 
-    Dolphin* dolphin = furi_record_open(RECORD_DOLPHIN);
-    DolphinStats stats = dolphin_stats(dolphin);
-    furi_record_close(RECORD_DOLPHIN);
-    app->dolphin_level = stats.level;
-
-    Storage* storage = furi_record_open(RECORD_STORAGE);
-    FlipperFormat* subghz_range = flipper_format_file_alloc(storage);
-    app->subghz_extend = false;
-    app->subghz_bypass = false;
-    if(flipper_format_file_open_existing(subghz_range, "/ext/subghz/assets/extend_range.txt")) {
-        flipper_format_read_bool(
-            subghz_range, "use_ext_range_at_own_risk", &app->subghz_extend, 1);
-        flipper_format_read_bool(subghz_range, "ignore_default_tx_region", &app->subghz_bypass, 1);
-    }
-    flipper_format_free(subghz_range);
-
-    uint current_pack = 0;
-    asset_packs_init(app->asset_packs);
-    File* folder = storage_file_alloc(storage);
-    FileInfo info;
-    char* name = malloc(MAX_PACK_NAME_LEN);
-    if(storage_dir_open(folder, PACKS_DIR)) {
-        while(storage_dir_read(folder, &info, name, MAX_PACK_NAME_LEN)) {
-            if(info.flags & FSF_DIRECTORY) {
-                char* copy = malloc(MAX_PACK_NAME_LEN);
-                strlcpy(copy, name, MAX_PACK_NAME_LEN);
-                uint idx = 0;
-                if(strcmp(copy, "NSFW") != 0) {
-                    for(; idx < asset_packs_size(app->asset_packs); idx++) {
-                        char* comp = *asset_packs_get(app->asset_packs, idx);
-                        if(strcasecmp(copy, comp) < 0 && strcmp(comp, "NSFW") != 0) {
-                            break;
-                        }
-                    }
-                }
-                asset_packs_push_at(app->asset_packs, idx, copy);
-                if(current_pack != 0) {
-                    if(idx < current_pack) current_pack++;
-                } else {
-                    if(strcmp(copy, xtreme_settings->asset_pack) == 0) current_pack = idx + 1;
-                }
-            }
-        }
-    }
-    free(name);
-    storage_file_free(folder);
-    furi_record_close(RECORD_STORAGE);
-
     item = variable_item_list_add(
         var_item_list,
         "Asset Pack",
         asset_packs_size(app->asset_packs) + 1,
         xtreme_app_scene_main_asset_pack_changed,
         app);
-    variable_item_set_current_value_index(item, current_pack);
+    variable_item_set_current_value_index(item, app->asset_pack);
     variable_item_set_current_value_text(
-        item, current_pack == 0 ? "SFW" : *asset_packs_get(app->asset_packs, current_pack - 1));
+        item, app->asset_pack == 0 ? "SFW" : *asset_packs_get(app->asset_packs, app->asset_pack - 1));
 
     item = variable_item_list_add(
         var_item_list,
@@ -329,9 +282,7 @@ void xtreme_app_scene_main_on_enter(void* context) {
     variable_item_set_current_value_index(item, xtreme_settings->sort_dirs_first);
     variable_item_set_current_value_text(item, xtreme_settings->sort_dirs_first ? "ON" : "OFF");
 
-    FuriString* version_tag = furi_string_alloc_printf(
-        "%s  %s", version_get_gitbranchnum(NULL), version_get_builddate(NULL));
-    variable_item_list_add(var_item_list, furi_string_get_cstr(version_tag), 0, NULL, app);
+    variable_item_list_add(var_item_list, furi_string_get_cstr(app->version_tag), 0, NULL, app);
 
     view_dispatcher_switch_to_view(app->view_dispatcher, XtremeAppViewVarItemList);
 }
@@ -345,10 +296,5 @@ bool xtreme_app_scene_main_on_event(void* context, SceneManagerEvent event) {
 
 void xtreme_app_scene_main_on_exit(void* context) {
     XtremeApp* app = context;
-    asset_packs_it_t it;
-    for(asset_packs_it(it, app->asset_packs); !asset_packs_end_p(it); asset_packs_next(it)) {
-        free(*asset_packs_cref(it));
-    }
-    asset_packs_clear(app->asset_packs);
     variable_item_list_reset(app->var_item_list);
 }
diff --git a/applications/settings/xtreme_app/xtreme_app.c b/applications/settings/xtreme_app/xtreme_app.c
index b700576be..89c30a363 100644
--- a/applications/settings/xtreme_app/xtreme_app.c
+++ b/applications/settings/xtreme_app/xtreme_app.c
@@ -82,6 +82,59 @@ XtremeApp* xtreme_app_alloc() {
     app->popup = popup_alloc();
     view_dispatcher_add_view(app->view_dispatcher, XtremeAppViewPopup, popup_get_view(app->popup));
 
+    // Settings init
+
+    XtremeSettings* xtreme_settings = XTREME_SETTINGS();
+
+    Dolphin* dolphin = furi_record_open(RECORD_DOLPHIN);
+    DolphinStats stats = dolphin_stats(dolphin);
+    app->dolphin_level = stats.level;
+    furi_record_close(RECORD_DOLPHIN);
+
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    FlipperFormat* subghz_range = flipper_format_file_alloc(storage);
+    app->subghz_extend = false;
+    app->subghz_bypass = false;
+    if(flipper_format_file_open_existing(subghz_range, "/ext/subghz/assets/extend_range.txt")) {
+        flipper_format_read_bool(subghz_range, "use_ext_range_at_own_risk", &app->subghz_extend, 1);
+        flipper_format_read_bool(subghz_range, "ignore_default_tx_region", &app->subghz_bypass, 1);
+    }
+    flipper_format_free(subghz_range);
+
+    app->asset_pack = 0;
+    asset_packs_init(app->asset_packs);
+    File* folder = storage_file_alloc(storage);
+    FileInfo info;
+    char* name = malloc(MAX_PACK_NAME_LEN);
+    if(storage_dir_open(folder, PACKS_DIR)) {
+        while(storage_dir_read(folder, &info, name, MAX_PACK_NAME_LEN)) {
+            if(info.flags & FSF_DIRECTORY) {
+                char* copy = malloc(MAX_PACK_NAME_LEN);
+                strlcpy(copy, name, MAX_PACK_NAME_LEN);
+                uint idx = 0;
+                if(strcmp(copy, "NSFW") != 0) {
+                    for(; idx < asset_packs_size(app->asset_packs); idx++) {
+                        char* comp = *asset_packs_get(app->asset_packs, idx);
+                        if(strcasecmp(copy, comp) < 0 && strcmp(comp, "NSFW") != 0) {
+                            break;
+                        }
+                    }
+                }
+                asset_packs_push_at(app->asset_packs, idx, copy);
+                if(app->asset_pack != 0) {
+                    if(idx < app->asset_pack) app->asset_pack++;
+                } else {
+                    if(strcmp(copy, xtreme_settings->asset_pack) == 0) app->asset_pack = idx + 1;
+                }
+            }
+        }
+    }
+    free(name);
+    storage_file_free(folder);
+    furi_record_close(RECORD_STORAGE);
+
+    app->version_tag = furi_string_alloc_printf("%s  %s", version_get_gitbranchnum(NULL), version_get_builddate(NULL));
+
     return app;
 }
 
@@ -98,6 +151,16 @@ void xtreme_app_free(XtremeApp* app) {
     view_dispatcher_free(app->view_dispatcher);
     scene_manager_free(app->scene_manager);
 
+    // Settings deinit
+
+    asset_packs_it_t it;
+    for(asset_packs_it(it, app->asset_packs); !asset_packs_end_p(it); asset_packs_next(it)) {
+        free(*asset_packs_cref(it));
+    }
+    asset_packs_clear(app->asset_packs);
+
+    furi_string_free(app->version_tag);
+
     // Records
     furi_record_close(RECORD_GUI);
     free(app);
diff --git a/applications/settings/xtreme_app/xtreme_app.h b/applications/settings/xtreme_app/xtreme_app.h
index e31103d35..e4c4ae16e 100644
--- a/applications/settings/xtreme_app/xtreme_app.h
+++ b/applications/settings/xtreme_app/xtreme_app.h
@@ -32,7 +32,9 @@ typedef struct {
     bool require_reboot;
     bool save_subghz;
     bool save_level;
+    uint asset_pack;
     asset_packs_t asset_packs;
+    FuriString* version_tag;
 } XtremeApp;
 
 typedef enum {