diff --git a/applications/main/momentum_app/scenes/momentum_app_scene_interface_mainmenu.c b/applications/main/momentum_app/scenes/momentum_app_scene_interface_mainmenu.c
index e42441633..17f17f729 100644
--- a/applications/main/momentum_app/scenes/momentum_app_scene_interface_mainmenu.c
+++ b/applications/main/momentum_app/scenes/momentum_app_scene_interface_mainmenu.c
@@ -39,7 +39,7 @@ static void momentum_app_scene_interface_mainmenu_app_changed(VariableItem* item
         item, *CharList_get(app->mainmenu_app_labels, app->mainmenu_app_index));
     size_t count = CharList_size(app->mainmenu_app_labels);
     char label[20];
-    snprintf(label, 20, "App  %u/%u", 1 + app->mainmenu_app_index, count);
+    snprintf(label, sizeof(label), "App  %u/%u", 1 + app->mainmenu_app_index, count);
     variable_item_set_item_label(item, label);
 }
 
@@ -87,7 +87,7 @@ void momentum_app_scene_interface_mainmenu_on_enter(void* context) {
     if(count) {
         app->mainmenu_app_index = CLAMP(app->mainmenu_app_index, count - 1, 0U);
         char label[20];
-        snprintf(label, 20, "App  %u/%u", 1 + app->mainmenu_app_index, count);
+        snprintf(label, sizeof(label), "App  %u/%u", 1 + app->mainmenu_app_index, count);
         variable_item_set_item_label(item, label);
         variable_item_set_current_value_text(
             item, *CharList_get(app->mainmenu_app_labels, app->mainmenu_app_index));
@@ -146,7 +146,7 @@ bool momentum_app_scene_interface_mainmenu_on_event(void* context, SceneManagerE
             if(count) {
                 app->mainmenu_app_index = CLAMP(app->mainmenu_app_index, count - 1, 0U);
                 char label[20];
-                snprintf(label, 20, "App  %u/%u", 1 + app->mainmenu_app_index, count);
+                snprintf(label, sizeof(label), "App  %u/%u", 1 + app->mainmenu_app_index, count);
                 variable_item_set_item_label(item, label);
                 variable_item_set_current_value_text(
                     item, *CharList_get(app->mainmenu_app_labels, app->mainmenu_app_index));
diff --git a/applications/main/momentum_app/scenes/momentum_app_scene_misc.c b/applications/main/momentum_app/scenes/momentum_app_scene_misc.c
index 558ea2bbd..ca66861f8 100644
--- a/applications/main/momentum_app/scenes/momentum_app_scene_misc.c
+++ b/applications/main/momentum_app/scenes/momentum_app_scene_misc.c
@@ -19,7 +19,7 @@ static void momentum_app_scene_misc_charge_cap_changed(VariableItem* item) {
     MomentumApp* app = variable_item_get_context(item);
     char cap_str[6];
     uint32_t value = (variable_item_get_current_value_index(item) + 1) * CHARGE_CAP_INTV;
-    snprintf(cap_str, 6, "%lu%%", value);
+    snprintf(cap_str, sizeof(cap_str), "%lu%%", value);
     variable_item_set_current_value_text(item, cap_str);
     momentum_settings.charge_cap = value;
     app->save_settings = true;
@@ -45,7 +45,7 @@ void momentum_app_scene_misc_on_enter(void* context) {
 
     char cap_str[6];
     value_index = momentum_settings.charge_cap / CHARGE_CAP_INTV;
-    snprintf(cap_str, 6, "%lu%%", (uint32_t)value_index * CHARGE_CAP_INTV);
+    snprintf(cap_str, sizeof(cap_str), "%lu%%", (uint32_t)value_index * CHARGE_CAP_INTV);
     item = variable_item_list_add(
         var_item_list,
         "Charge Cap",
diff --git a/applications/main/momentum_app/scenes/momentum_app_scene_protocols_freqs_add.c b/applications/main/momentum_app/scenes/momentum_app_scene_protocols_freqs_add.c
index aa51add21..3bbe082da 100644
--- a/applications/main/momentum_app/scenes/momentum_app_scene_protocols_freqs_add.c
+++ b/applications/main/momentum_app/scenes/momentum_app_scene_protocols_freqs_add.c
@@ -1,8 +1,8 @@
 #include "../momentum_app.h"
 
-enum TextInputResult {
-    TextInputResultOk,
-    TextInputResultError,
+enum NumberInputResult {
+    NumberInputResultOk,
+    NumberInputResultError,
 };
 
 static void
@@ -11,7 +11,7 @@ static void
 
     uint32_t value = number * 1000;
     if(!furi_hal_subghz_is_frequency_valid(value)) {
-        view_dispatcher_send_custom_event(app->view_dispatcher, TextInputResultError);
+        view_dispatcher_send_custom_event(app->view_dispatcher, NumberInputResultError);
         return;
     }
     bool is_hopper =
@@ -22,7 +22,7 @@ static void
         FrequencyList_push_back(app->subghz_static_freqs, value);
     }
     app->save_subghz_freqs = true;
-    view_dispatcher_send_custom_event(app->view_dispatcher, TextInputResultOk);
+    view_dispatcher_send_custom_event(app->view_dispatcher, NumberInputResultOk);
 }
 
 void momentum_app_scene_protocols_freqs_add_on_enter(void* context) {
@@ -54,10 +54,10 @@ bool momentum_app_scene_protocols_freqs_add_on_event(void* context, SceneManager
     if(event.type == SceneManagerEventTypeCustom) {
         consumed = true;
         switch(event.event) {
-        case TextInputResultOk:
+        case NumberInputResultOk:
             scene_manager_previous_scene(app->scene_manager);
             break;
-        case TextInputResultError:
+        case NumberInputResultError:
             popup_set_header(app->popup, "Invalid frequency!", 64, 18, AlignCenter, AlignCenter);
             popup_set_text(
                 app->popup,
@@ -83,5 +83,6 @@ bool momentum_app_scene_protocols_freqs_add_on_event(void* context, SceneManager
 
 void momentum_app_scene_protocols_freqs_add_on_exit(void* context) {
     MomentumApp* app = context;
-    text_input_reset(app->text_input);
+    number_input_set_result_callback(app->number_input, NULL, NULL, 0, 0, 0);
+    number_input_set_header_text(app->number_input, "");
 }